Simplify form validation

05de3bc3 · Michal Čihař · cfac82f0 · 05de3bc3
Commit 05de3bc3 authored Feb 02, 2014 by Michal Čihař
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 10 deletions

weblate/accounts/forms.py weblate/accounts/forms.py +6 -10

No files found.
--- a/weblate/accounts/forms.py
+++ b/weblate/accounts/forms.py
@@ -419,17 +419,13 @@ class PasswordForm(forms.Form):
        field.

        """
-        try:
-            password1 = self.cleaned_data['password1']
-            password2 = self.cleaned_data['password2']
+        password1 = self.cleaned_data.get('password1', '')
+        password2 = self.cleaned_data.get('password2', '')

-            if password1 != password2:
-                raise forms.ValidationError(
-                    _('You must type the same password each time.')
-                )
-
-        except KeyError:
-            pass
+        if password1 != password2:
+            raise forms.ValidationError(
+                _('You must type the same password each time.')
+            )

        return self.cleaned_data