Merge pull request #3074 from tomchristie/unsaved_file_objects_serialize_to_none

Unsaved file objects may not have an associated URL.

Author: tomchristie

rest_framework/fields.py

@@ -1198,8 +1198,12 @@ def to_internal_value(self, data):
         return data
 
     def to_representation(self, value):
+        if not value:
+            return None
+
         if self.use_url:
-            if not value:
+            if not getattr(value, 'url', None):
+                # If the file has not been saved it may not have a URL.
                 return None
             url = value.url
             request = self.context.get('request', None)