Ticket #10806: forms-typeerror.patch

django/forms/forms.py

@@ -4 +4 @@
 
 from copy import deepcopy
 
-from django.utils.datastructures import SortedDict
+from django.utils.datastructures import SortedDict, MergeDict
 from django.utils.html import conditional_escape
 from django.utils.encoding import StrAndUnicode, smart_unicode, force_unicode
 from django.utils.safestring import mark_safe
@@ -72 +72 @@
                  initial=None, error_class=ErrorList, label_suffix=':',
                  empty_permitted=False):
         self.is_bound = data is not None or files is not None
+        
+        if data <> None and not isinstance(data, (dict, MergeDict)):
+            raise TypeError('data parameter must be of type dict not of type %s' % type(data))
+        
+        if files <> None and not isinstance(files, (dict, MergeDict)):
+            raise TypeError('files parameter must be of type dict not of type %s' % type(files))
+        
         self.data = data or {}
         self.files = files or {}
         self.auto_id = auto_id

tests/regressiontests/forms/forms.py

@@ -189 +189 @@
 >>> p.cleaned_data['birthday']
 datetime.date(1940, 10, 9)
 
+passing something other than a dict into __init__ will raise a TypeError
+>>> p = Person('a string')
+Traceback (most recent call last):
+...
+TypeError: data parameter must be of type dict not of type <type 'str'>
+
+this is also true for the files parameter of __init__
+>>> p = Person(data, files='another string')
+Traceback (most recent call last):
+...
+TypeError: files parameter must be of type dict not of type <type 'str'>
 
 cleaned_data will include a key and value for *all* fields defined in the Form,
 even if the Form's data didn't include a value for fields that are not