Fixed #28982 -- Simplified code with and/or.

2 files changed, 2 insertions, 5 deletions

diff --git a/django/db/models/fields/__init__.py b/django/db/models/fields/__init__.py
index 6ddd8f033a..da3fca1213 100644
--- a/django/db/models/fields/__init__.py
+++ b/django/db/models/fields/__init__.py
@@ -694,8 +694,7 @@ class Field(RegisterLookupMixin):
         return self._db_tablespace or settings.DEFAULT_INDEX_TABLESPACE
 
     def set_attributes_from_name(self, name):
-        if not self.name:
-            self.name = name
+        self.name = self.name or name
         self.attname, self.column = self.get_attname_column()
         self.concrete = self.column is not None
         if self.verbose_name is None and self.name:
diff --git a/django/db/models/fields/files.py b/django/db/models/fields/files.py
index 683a34ecd9..2d1d4b5e5f 100644
--- a/django/db/models/fields/files.py
+++ b/django/db/models/fields/files.py
@@ -314,9 +314,7 @@ class FileField(Field):
         if data is not None:
             # This value will be converted to str and stored in the
             # database, so leaving False as-is is not acceptable.
-            if not data:
-                data = ''
-            setattr(instance, self.name, data)
+            setattr(instance, self.name, data or '')
 
     def formfield(self, **kwargs):
         return super().formfield(**{