From 17cbec789af44ca5bfb901556ff469e305153e58 Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Mon, 12 Oct 2015 16:12:06 +0200 Subject: [PATCH] profile_views,profile_forms: fix unicode error in log string (fixes #8609) Also modify reset password test to get a non-regression test. --- src/authentic2/profile_forms.py | 2 +- src/authentic2/profile_views.py | 4 ++-- src/authentic2/tests/test_all.py | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/authentic2/profile_forms.py b/src/authentic2/profile_forms.py index b1e0bb9..a2455ef 100644 --- a/src/authentic2/profile_forms.py +++ b/src/authentic2/profile_forms.py @@ -61,5 +61,5 @@ class PasswordResetForm(forms.Form): c) send_mail(subject, email, from_email, [user.email], html_message=html_email) - logger.info('password reset requests for %s, email sent to %s ' + logger.info(u'password reset requests for %s, email sent to %s ' 'with token %s...', user, user.email, c['token'][:9]) diff --git a/src/authentic2/profile_views.py b/src/authentic2/profile_views.py index a2e38bf..098877e 100644 --- a/src/authentic2/profile_views.py +++ b/src/authentic2/profile_views.py @@ -108,8 +108,8 @@ class PasswordResetConfirmView(cbv.RedirectToNextURLViewMixin, FormView): def form_valid(self, form): form.save() self.user.backend = 'authentic2.backends.models_backend.ModelBackend' - logging.getLogger(__name__).info('user %s resetted its password with ' - 'token %s...', self.user, + logging.getLogger(__name__).info(u'user %s resetted its password with ' + 'token %r...', self.user, self.token[:9]) return utils.login(self.request, self.user, 'email') diff --git a/src/authentic2/tests/test_all.py b/src/authentic2/tests/test_all.py index a821032..d1f614f 100644 --- a/src/authentic2/tests/test_all.py +++ b/src/authentic2/tests/test_all.py @@ -1132,7 +1132,8 @@ class APITest(TestCase): class PasswordResetTest(Authentic2TestCase): def setUp(self): User = get_user_model() - user = User(username='john.doe', email='john.doe@example.com') + user = User(username='jôhn.doe', first_name=u'Jôhn', last_name='Doe', + email='john.doe@example.com') user.set_password('password') user.save() user.last_login = user.date_joined -- 2.1.4