Ticket #8620: django_model_forms_excluding_fields_fix.diff

forms/models.py

@@ -201 +201 @@
                                       opts.exclude, formfield_callback)
             # 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