From 1cb4dff1be18c2933ebb3c5a58c113937b80208a Mon Sep 17 00:00:00 2001 From: Serge Matveenko Date: Wed, 30 Dec 2015 17:14:43 +0300 Subject: [PATCH] Always set `FileField.use_url` property. `FileField.use_url` property should be always set to allow more simple usage of it in subclasses. --- rest_framework/fields.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 7bac2a21f..f2316b55b 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -1352,8 +1352,7 @@ class FileField(Field): def __init__(self, *args, **kwargs): self.max_length = kwargs.pop('max_length', None) self.allow_empty_file = kwargs.pop('allow_empty_file', False) - if 'use_url' in kwargs: - self.use_url = kwargs.pop('use_url') + self.use_url = kwargs.pop('use_url', api_settings.UPLOADED_FILES_USE_URL) super(FileField, self).__init__(*args, **kwargs) def to_internal_value(self, data): @@ -1374,12 +1373,10 @@ class FileField(Field): return data def to_representation(self, value): - use_url = getattr(self, 'use_url', api_settings.UPLOADED_FILES_USE_URL) - if not value: return None - if use_url: + if self.use_url: if not getattr(value, 'url', None): # If the file has not been saved it may not have a URL. return None