encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-08-06 21:40:13 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge 1cb4dff1be into 7ecd4f7813

Browse Source
This commit is contained in:
Serge Matveenko 2016-12-11 10:13:25 +00:00 committed by GitHub
commit adf4212960
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
rest_framework/fields.py
View File

@ -1423,8 +1423,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):
@ -1445,12 +1444,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