From 163639501c602d42adcad9b5ac5edbddd75d0af8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Sun, 25 Mar 2018 10:21:07 +0200 Subject: [PATCH] python3: always use %s to get user representation in logs --- mellon/views.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mellon/views.py b/mellon/views.py index 76be9ed..263fbad 100644 --- a/mellon/views.py +++ b/mellon/views.py @@ -200,7 +200,7 @@ class LoginView(ProfileMixin, LogMixin, View): if user is not None: if user.is_active: utils.login(request, user) - self.log.info('user %r (NameID is %r) logged in using SAML', unicode(user), + self.log.info('user %s (NameID is %r) logged in using SAML', user, attributes['name_id_content']) request.session['mellon_session'] = utils.flatten_datetime(attributes) if ('session_not_on_or_after' in attributes and @@ -209,7 +209,7 @@ class LoginView(ProfileMixin, LogMixin, View): utils.get_seconds_expiry( attributes['session_not_on_or_after'])) else: - self.log.warning('user %r (NameID is %r) is inactive, login refused', unicode(user), + self.log.warning('user %s (NameID is %r) is inactive, login refused', user, attributes['name_id_content']) return render(request, 'mellon/inactive_user.html', { 'user': user,