diff options
Diffstat (limited to 'mediagoblin/auth')
| -rw-r--r-- | mediagoblin/auth/tools.py | 6 | ||||
| -rw-r--r-- | mediagoblin/auth/views.py | 9 |
2 files changed, 10 insertions, 5 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() diff --git a/mediagoblin/auth/views.py b/mediagoblin/auth/views.py index 3d132f84..03a46f7b 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'): |