Ticket #3896: 3896.2.diff

django/newforms/forms.py

@@ -187 +187 @@
                 value = field.clean(value)
                 self.cleaned_data[name] = value
                 if hasattr(self, 'clean_%s' % name):
-                    value = getattr(self, 'clean_%s' % name)()
+                    value = getattr(self, 'clean_%s' % name)(value)
                 self.cleaned_data[name] = value
             except ValidationError, e:
                 errors[name] = e.messages

tests/regressiontests/forms/tests.py

@@ -2434 +2434 @@
 Validation errors are HTML-escaped when output as HTML.
 >>> class EscapingForm(Form):
 ...     special_name = CharField()
-...     def clean_special_name(self):
-...         raise ValidationError("Something's wrong with '%s'" % self.cleaned_data['special_name'])
+...     def clean_special_name(self, value):
+...         raise ValidationError("Something's wrong with '%s'" % value)
 
 >>> f = EscapingForm({'special_name': "Nothing to escape"}, auto_id=False)
 >>> print f
@@ -2457 +2457 @@
 ...    username = CharField(max_length=10)
 ...    password1 = CharField(widget=PasswordInput)
 ...    password2 = CharField(widget=PasswordInput)
-...    def clean_password2(self):
-...        if self.cleaned_data.get('password1') and self.cleaned_data.get('password2') and self.cleaned_data['password1'] != self.cleaned_data['password2']:
+...    def clean_password2(self, value):
+...        if self.cleaned_data.get('password1') and self.cleaned_data.get('password2') and self.cleaned_data['password1'] != value:
 ...            raise ValidationError(u'Please make sure your passwords match.')
-...        return self.cleaned_data['password2']
+...        return value
 >>> f = UserRegistration(auto_id=False)
 >>> f.errors
 {}