encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-04-26 20:13:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

Avoided double call for remote url in FileField.to_representation. (#6841)

Browse Source
This commit is contained in:
zeroohub 2019-08-06 18:31:46 +08:00 committed by Carlton Gibson
parent 0cc09f0c0d
commit 7e1c4be7ce
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rest_framework/fields.py
View File

@ -1546,16 +1546,16 @@ 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
except AttributeError:
return None return None
url = value.url
request = self.context.get('request', None) request = self.context.get('request', None)
if request is not None: if request is not None:
return request.build_absolute_uri(url) return request.build_absolute_uri(url)
return url return url
return value.name return value.name