encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-07-29 01:20:02 +03:00
Code Issues Packages Projects Releases Wiki Activity

change FileField.to_representation to EAFP style

Browse Source
This commit is contained in:
dorian 2019-07-28 16:55:47 +08:00
parent 0e1c5d3132
commit 55ea891fff
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
rest_framework/fields.py
View File

@ -1546,16 +1546,15 @@ class FileField(Field):
return None return None
use_url = getattr(self, 'use_url', api_settings.UPLOADED_FILES_USE_URL) use_url = getattr(self, 'use_url', api_settings.UPLOADED_FILES_USE_URL)
if use_url: if use_url:
if not getattr(value, 'url', None): try:
# If the file has not been saved it may not have a URL. url = value.url
request = self.context.get('request', None)
if request is not None:
return request.build_absolute_uri(url)
return url
except AttributeError:
return None return None
url = value.url
request = self.context.get('request', None)
if request is not None:
return request.build_absolute_uri(url)
return url
return value.name return value.name