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

zeroohub · carltongibson · commit 7e1c4be7ced1 · 2019-08-06T12:31:46.000+02:00
diff --git a/rest_framework/fields.py b/rest_framework/fields.py
@@ -1546,16 +1546,16 @@ def to_representation(self, value):
             return None
 
         use_url = getattr(self, 'use_url', api_settings.UPLOADED_FILES_USE_URL)
-
         if use_url:
-            if not getattr(value, 'url', None):
-                # If the file has not been saved it may not have a URL.
+            try:
+                url = value.url
+            except AttributeError:
                 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
 
 
