X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/8f0002c5c9dcd3419f4e29ad3d44ca7131793bac..8a6bfd84137635211aa15f3991aa681c37d4cb6e:/forum_modules/localauth/forms.py diff --git a/forum_modules/localauth/forms.py b/forum_modules/localauth/forms.py index a3fd992..9529bba 100644 --- a/forum_modules/localauth/forms.py +++ b/forum_modules/localauth/forms.py @@ -1,4 +1,4 @@ -from forum.utils.forms import NextUrlField, UserNameField, UserEmailField, SetPasswordForm +from forum.forms import NextUrlField, UserNameField, UserEmailField, SetPasswordForm from forum.models import Question from forum.modules import call_all_handlers from django.contrib.contenttypes.models import ContentType @@ -20,7 +20,7 @@ class ClassicRegisterForm(SetPasswordForm): spam_fields = call_all_handlers('create_anti_spam_field') if spam_fields: spam_fields = dict(spam_fields) - for name,field in spam_fields.items(): + for name, field in spam_fields.items(): self.fields[name] = field self._anti_spam_fields = spam_fields.keys() @@ -33,18 +33,18 @@ class ClassicRegisterForm(SetPasswordForm): class ClassicLoginForm(forms.Form): """ legacy account signin form """ next = NextUrlField() - username = UserNameField(required=False,skip_clean=True) + username = UserNameField(required=False, skip_clean=True) password = forms.CharField(max_length=128, - widget=forms.widgets.PasswordInput(attrs={'class':'required login'}), - required=False) + widget=forms.widgets.PasswordInput(attrs={'class':'required login'}), + required=False) def __init__(self, data=None, files=None, auto_id='id_%s', - prefix=None, initial=None): + prefix=None, initial=None): super(ClassicLoginForm, self).__init__(data, files, auto_id, - prefix, initial) + prefix, initial) self.user_cache = None - def _clean_nonempty_field(self,field): + def _clean_nonempty_field(self, field): value = None if field in self.cleaned_data: value = self.cleaned_data[field].strip() @@ -72,13 +72,11 @@ class ClassicLoginForm(forms.Form): del self.cleaned_data['username'] del self.cleaned_data['password'] - error_list.insert(0,(_("Please enter valid username and password " - "(both are case-sensitive)."))) + error_list.insert(0, (_("Please enter valid username and password " + "(both are case-sensitive)."))) - elif not user_.is_active: - error_list.append(_("This account is inactive.")) if len(error_list) > 0: - error_list.insert(0,_('Login failed.')) + error_list.insert(0, _('Login failed.')) try: self.user_cache = user_.user except: