diff options
Diffstat (limited to 'mediagoblin/auth/views.py')
| -rw-r--r-- | mediagoblin/auth/views.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/mediagoblin/auth/views.py b/mediagoblin/auth/views.py index 3d132f84..2f95fd81 100644 --- a/mediagoblin/auth/views.py +++ b/mediagoblin/auth/views.py @@ -14,6 +14,8 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. +import six + from itsdangerous import BadSignature from mediagoblin import messages, mg_globals @@ -84,16 +86,17 @@ def login(request): login_failed = False if request.method == 'POST': - username = login_form.username.data if login_form.validate(): - user = check_login_simple(username, login_form.password.data) + user = check_login_simple( + login_form.username.data, + login_form.password.data) if user: # set up login in session if login_form.stay_logged_in.data: request.session['stay_logged_in'] = True - request.session['user_id'] = unicode(user.id) + request.session['user_id'] = six.text_type(user.id) request.session.save() if request.form.get('next'): @@ -192,7 +195,7 @@ def resend_activation(request): messages.ERROR, _("You've already verified your email address!")) - return redirect(request, "mediagoblin.user_pages.user_home", user=request.user['username']) + return redirect(request, "mediagoblin.user_pages.user_home", user=request.user.username) email_debug_message(request) send_verification_email(request.user, request) |