1 files changed, 4 insertions, 2 deletions
diff --git a/mediagoblin/auth/tools.py b/mediagoblin/auth/tools.py
index 39df85af..3737fab6 100644
--- a/mediagoblin/auth/tools.py
+++ b/mediagoblin/auth/tools.py
@@ -16,6 +16,8 @@
 
 
 import logging
+
+import six
 import wtforms
 from sqlalchemy import or_
 
@@ -136,7 +138,7 @@ def register_user(request, register_form):
         user.save()
 
         # log the user in
-        request.session['user_id'] = unicode(user.id)
+        request.session['user_id'] = six.text_type(user.id)
         request.session.save()
 
         # send verification email
@@ -182,7 +184,7 @@ def no_auth_logout(request):
     Log out the user if no authentication is enabled, but don't delete
     the messages
     """
-    if not mg_globals.app.auth and 'user_id' in request.session:
+    if not request.app.auth and 'user_id' in request.session:
         del request.session['user_id']
         request.session.save()