Ticket #15126: django15126.testfields.diff

tests/regressiontests/forms/tests/models.py

@@ -1 +1 @@
 # -*- coding: utf-8 -*-
 import datetime
 from django.core.files.uploadedfile import SimpleUploadedFile
+from django.core.exceptions import FieldError
 from django.forms import Form, ModelForm, FileField, ModelChoiceField
 from django.test import TestCase
 from regressiontests.forms.models import ChoiceModel, ChoiceOptionModel, ChoiceFieldModel, FileModel, Group, BoundaryModel, Defaults
@@ -159 +160 @@
         self.assertEqual(obj.name, u'class default value')
         self.assertEqual(obj.value, 99)
         self.assertEqual(obj.def_date, datetime.date(1999, 3, 2))
+
+    def test_fields_validation(self):
+        """ Test whether 'fields' and 'exclude' options are validated #15126 """
+
+        class ValidModelForm(ModelForm):
+            class Meta:
+                model = Defaults
+                fields = ('name', )
+                exclude = ('value', )
+
+        valid_form = ValidModelForm()
+        self.assertEqual(valid_form._meta.fields, ('name', ))
+
+        try:
+            class InvalidFieldsModelForm(ModelForm):
+                class Meta:
+                    model = Defaults
+                    fields = ('name') # Not a valid list, but a string
+            self.fail('Incorrect "fields"-option type not detected on ModelForm')
+        except TypeError: # correct TypeError
+            pass 
+        except FieldError: # missing field because of faulty typing 
+            self.fail('Incorrect "fields"-option type not detected on ModelForm')
+
+        try:
+            class InvalidExcludeModelForm(ModelForm):
+                class Meta:
+                    model = Defaults
+                    exclude = ('name') # Not a valid list, but a string
+            self.fail('Incorrect "exclude"-option type not detected on ModelForm')
+        except TypeError: # correct TypeError
+            pass 

django/forms/models.py

@@ -200 +200 @@
         if 'media' not in attrs:
             new_class.media = media_property(new_class)
         opts = new_class._meta = ModelFormOptions(getattr(new_class, 'Meta', None))
+
+        def _check_option_iterable(option):
+            """ Check whether option is a valid iterable and retrieve from options (#15126) """
+            value = getattr(opts, option, None)
+            if value is not None and isinstance(value, str):
+                raise TypeError('Option "%s" on %s must be a valid list' 
+                    ', not "%s".' % (option, new_class.__name__, type(value).__name__))
+
+        _check_option_iterable('fields')
+        _check_option_iterable('exclude')
+        
         if opts.model:
             # If a model is defined, extract form fields from it.
             fields = fields_for_model(opts.model, opts.fields,