diff options
Diffstat (limited to 'django')
| -rw-r--r-- | django/contrib/auth/forms.py | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/django/contrib/auth/forms.py b/django/contrib/auth/forms.py index 1d6d5e2743..a5de5bf650 100644 --- a/django/contrib/auth/forms.py +++ b/django/contrib/auth/forms.py @@ -100,10 +100,19 @@ class UserCreationForm(forms.ModelForm): self.error_messages['password_mismatch'], code='password_mismatch', ) - self.instance.username = self.cleaned_data.get('username') - password_validation.validate_password(self.cleaned_data.get('password2'), self.instance) return password2 + def _post_clean(self): + super()._post_clean() + # Validate the password after self.instance is updated with form data + # by super(). + password = self.cleaned_data.get('password2') + if password: + try: + password_validation.validate_password(password, self.instance) + except forms.ValidationError as error: + self.add_error('password2', error) + def save(self, commit=True): user = super().save(commit=False) user.set_password(self.cleaned_data["password1"]) |