summaryrefslogtreecommitdiff
path: root/django/forms
diff options
context:
space:
mode:
Diffstat (limited to 'django/forms')
-rw-r--r--django/forms/forms.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/django/forms/forms.py b/django/forms/forms.py
index f868165977..b5cf17f4eb 100644
--- a/django/forms/forms.py
+++ b/django/forms/forms.py
@@ -92,8 +92,8 @@ class DeclarativeFieldsMetaclass(MediaDefiningClass):
declared_fields.update(base.declared_fields)
# Field shadowing.
- for attr in base.__dict__.keys():
- if attr in declared_fields:
+ for attr, value in base.__dict__.items():
+ if value is None and attr in declared_fields:
declared_fields.pop(attr)
new_class.base_fields = declared_fields