Commit 7faa1398 authored by Eduardo Matos's avatar Eduardo Matos
Browse files

pep8 fixes

parent 3a9486e0
......@@ -46,8 +46,9 @@ class PasswordRecoveryForm(forms.Form):
self.cleaned_data['user'] = user = cleaner(username)
from django.conf import settings
recovery_only_active_users = getattr(settings,\
'RECOVER_ONLY_ACTIVE_USERS', False)
recovery_only_active_users = getattr(settings,
'RECOVER_ONLY_ACTIVE_USERS',
False)
if recovery_only_active_users and \
hasattr(user, 'is_active') and not user.is_active:
......
......@@ -94,7 +94,7 @@ class FormTests(TestCase):
}, case_sensitive=False)
self.assertTrue(form.is_valid())
def test_raise_error_if_user_is_inactive_and_settings_doesnt_allow_inactive_password_recovery(self):
def test_inactive_user_password_recovery(self):
user = create_user()
if hasattr(user, 'is_active'):
......@@ -102,20 +102,23 @@ class FormTests(TestCase):
user.save()
form = PasswordRecoveryForm(data={'username_or_email': user.email})
self.assertTrue(form.is_valid(), 'Password from inactive should be recovered')
self.assertTrue(form.is_valid(),
'Password from inactive should be recovered')
settings.RECOVER_ONLY_ACTIVE_USERS = True
form = PasswordRecoveryForm(data={'username_or_email': user.email})
self.assertFalse(form.is_valid(), 'Password from inactive user should not be recovered')
self.assertFalse(form.is_valid(),
'Password from inactive user should '
'not be recovered')
self.assertItemsEqual(form.errors['username_or_email'],
[u"Sorry, this user is inactive and his password can't be recovered."])
[u"Sorry, this user is inactive and his "
"password can't be recovered."])
# tear down settings
del settings.RECOVER_ONLY_ACTIVE_USERS
def test_form_custom_search(self):
# Searching only for email does some extra validation
form = PasswordRecoveryForm(data={
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment