Ticket #7833: usercreationform.patch

django/contrib/auth/tests/forms.py

@@ -44 +44 @@
 >>> form["password2"].errors
 [u"The two password fields didn't match."]
 
+The first password isn't specified
+
+>>> data = {
+...     'username': 'jsmith2',
+...     'password2': 'test123',
+... }
+>>> form = UserCreationForm(data)
+>>> form.is_valid()
+False
+>>> form["password1"].errors
+[u'This field is required.']
+
 The success case.
 
 >>> data = {

django/contrib/auth/forms.py

@@ -29 +29 @@
         raise forms.ValidationError(_("A user with that username already exists."))
     
     def clean_password2(self):
-        password1 = self.cleaned_data["password1"]
         password2 = self.cleaned_data["password2"]
+
+        try:
+            password1 = self.cleaned_data["password1"]
+        except KeyError:
+            # No password has been given to check against. We will
+            # skip our checks since the form will signal this to the
+            # user because the field is required.
+            return password2
+            
         if password1 != password2:
             raise forms.ValidationError(_("The two password fields didn't match."))
         return password2