Ticket #7837: forms_metaclass_hierarchy_problem_fix_r8049.diff

django/forms/models.py

@@ -229 +229 @@
 
         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

@@ -25 +25 @@
     file1 = django_forms.FileField()
 
 __test__ = {'API_TESTS': """
->>> from django.forms import form_for_model, form_for_instance
 >>> from django.core.files.uploadedfile import SimpleUploadedFile
 
 # FileModel with unicode filename and data #########################
@@ -37 +36 @@
 >>> m = FileModel.objects.create(file=f.cleaned_data['file1'])
 
 # Boundary conditions on a PostitiveIntegerField #########################
->>> BoundaryForm = form_for_model(BoundaryModel)
+>>> BoundaryForm = django_forms.form_for_model(BoundaryModel)
 >>> f = BoundaryForm({'positive_integer':100})
 >>> f.is_valid()
 True
@@ -51 +50 @@
 # Formfield initial values ########
 If the model has default values for some fields, they are used as the formfield
 initial values.
->>> DefaultsForm = form_for_model(Defaults)
+>>> DefaultsForm = django_forms.form_for_model(Defaults)
 >>> DefaultsForm().fields['name'].initial
 u'class default value'
 >>> DefaultsForm().fields['def_date'].initial
@@ -62 +61 @@
 In form_for_instance(), the initial values come from the instance's values, not
 the model's defaults.
 >>> foo_instance = Defaults(name=u'instance value', def_date = datetime.date(1969, 4, 4), value = 12)
->>> InstanceForm = form_for_instance(foo_instance)
+>>> InstanceForm = django_forms.form_for_instance(foo_instance)
 >>> InstanceForm().fields['name'].initial
 u'instance value'
 >>> InstanceForm().fields['def_date'].initial
 datetime.date(1969, 4, 4)
 >>> InstanceForm().fields['value'].initial
 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, django_forms.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']
 """}