Fixed #31706 -- Removed unnecessary getattr() call in FileDescriptor.__get__().

alosultan · web-flow · commit 6b25d24a5755 · 2020-06-15T07:26:49.000+02:00
refresh_from_db() loads fields values.
diff --git a/django/db/models/fields/files.py b/django/db/models/fields/files.py
@@ -173,11 +173,9 @@ def __get__(self, instance, cls=None):
 
         # The instance dict contains whatever was originally assigned
         # in __set__.
-        if self.field.name in instance.__dict__:
-            file = instance.__dict__[self.field.name]
-        else:
+        if self.field.name not in instance.__dict__:
             instance.refresh_from_db(fields=[self.field.name])
-            file = getattr(instance, self.field.name)
+        file = instance.__dict__[self.field.name]
 
         # If this value is a string (instance.file = "path/to/file") or None
         # then we simply wrap it with the appropriate attribute class according
