Ticket #8620: django_model_forms_excluding_fields_fix_2.diff

django/forms/models.py

@@ -214 +214 @@
                 raise FieldError(message)
             # Override default model fields with any custom declared ones
             # (plus, include all the other declared fields).
+            if opts.fields:
+                [declared_fields.pop(f) for f in declared_fields.keys() if f not in opts.fields]
+            if opts.exclude:
+                [declared_fields.pop(f) for f in declared_fields.keys() if f in opts.exclude]
             fields.update(declared_fields)
         else:
             fields = declared_fields

tests/regressiontests/forms/tests/models.py

@@ -1 +1 @@
 # -*- coding: utf-8 -*-
 import datetime
 from django.core.files.uploadedfile import SimpleUploadedFile
-from django.forms import Form, ModelForm, FileField, ModelChoiceField
+from django.forms import Form, ModelForm, FileField, ModelChoiceField, CharField
 from django.test import TestCase
 from regressiontests.forms.models import ChoiceModel, ChoiceOptionModel, ChoiceFieldModel, FileModel, Group, BoundaryModel, Defaults
 
@@ -154 +154 @@
 
         f = ExcludingForm({'name': u'Hello', 'value': 99, 'def_date': datetime.date(1999, 3, 2)})
         self.assertTrue(f.is_valid())
-        self.assertEqual(f.cleaned_data['name'], u'Hello')
+        self.assertNotIn('name', f.cleaned_data)
         obj = f.save()
         self.assertEqual(obj.name, u'class default value')
         self.assertEqual(obj.value, 99)
         self.assertEqual(obj.def_date, datetime.date(1999, 3, 2))
+
+
+class TestTicket8620(TestCase):
+    '''Allow exclusion of not only model fields but also form fields (as
+    might be defined in a superclass) using the exclude Meta attribute.'''
+
+    class ParentForm(ModelForm):
+        extra_non_model_field = CharField()
+
+    class ChildForm(ParentForm):
+        class Meta:
+            model = Defaults  # any model is suitable for this test
+            exclude = ('extra_non_model_field',)
+
+    def test_extra_non_model_field_is_excluded(self):
+        form = TestTicket8620.ChildForm()
+        self.assertNotIn('extra_non_model_field', form.fields)