Skip to content

Commit 7e1c4be

Browse files
zeroohubcarltongibson
authored andcommitted
Avoided double call for remote url in FileField.to_representation. (#6841)
1 parent 0cc09f0 commit 7e1c4be

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

rest_framework/fields.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1546,16 +1546,16 @@ def to_representation(self, value):
15461546
return None
15471547

15481548
use_url = getattr(self, 'use_url', api_settings.UPLOADED_FILES_USE_URL)
1549-
15501549
if use_url:
1551-
if not getattr(value, 'url', None):
1552-
# If the file has not been saved it may not have a URL.
1550+
try:
1551+
url = value.url
1552+
except AttributeError:
15531553
return None
1554-
url = value.url
15551554
request = self.context.get('request', None)
15561555
if request is not None:
15571556
return request.build_absolute_uri(url)
15581557
return url
1558+
15591559
return value.name
15601560

15611561

0 commit comments

Comments
 (0)