Ticket #7837: forms_metaclass_hierarchy_problem_fix_r8335.diff

django/forms/models.py

@@ -168 +168 @@
 
         if 'media' not in attrs:
             new_class.media = media_property(new_class)
-        declared_fields = get_declared_fields(bases, attrs, False)
+        if attrs.has_key('declared_fields'):
+            declared_fields = attrs['declared_fields']
+        else:
+            declared_fields = SortedDict()
+        declared_fields.update(get_declared_fields(bases, attrs, False))
         opts = new_class._meta = ModelFormOptions(getattr(new_class, 'Meta', None))
         if opts.model:
             # If a model is defined, extract form fields from it.

django/forms/forms.py

@@ -56 +56 @@
     'base_fields', taking into account parent class 'base_fields' as well.
     """
     def __new__(cls, name, bases, attrs):
-        attrs['base_fields'] = get_declared_fields(bases, attrs)
+        declared_fields = get_declared_fields(bases, attrs)
+        attrs['declared_fields'] = declared_fields
+        attrs['base_fields'] = declared_fields
         new_class = super(DeclarativeFieldsMetaclass,
                      cls).__new__(cls, name, bases, attrs)
         if 'media' not in attrs:

tests/regressiontests/forms/models.py

@@ -73 +73 @@
 datetime.date(1969, 4, 4)
 >>> instance_form.initial['value']
 12
+
+
+# Regression test for #7837 ##################################################
+
+Make sure hierarchy in metaclasses doesn't miss declared fields
+
+>>> class ExtraFieldForm(django_forms.Form):
+...     extra_field = django_forms.CharField()
+
+>>> class ChildForm(ExtraFieldForm, ModelForm):
+...    # this is necessary to avoid python metaclass conflict error
+...    __metaclass__ = type('ChildFormMetaclass', (ExtraFieldForm.__metaclass__, django_forms.ModelForm.__metaclass__), {})
+...    non_existing_field = django_forms.CharField()
+...    class Meta:
+...        model = ChoiceModel
+
+>>> ChildForm.base_fields.keys()
+['name', 'extra_field', 'non_existing_field']
 """}