aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/tests/test_auth.py
diff options
context:
space:
mode:
authorBerker Peksag <berker.peksag@gmail.com>2014-06-02 20:59:28 +0300
committerBerker Peksag <berker.peksag@gmail.com>2014-06-02 20:59:28 +0300
commite49b7e02b2150413d2e78db709277fae0887be46 (patch)
tree6c39946f2b4aca080c75274f97ec263f793ae012 /mediagoblin/tests/test_auth.py
parenta80c74bbcc6ac0208cfef725a441810a29876cff (diff)
downloadmediagoblin-e49b7e02b2150413d2e78db709277fae0887be46.tar.lz
mediagoblin-e49b7e02b2150413d2e78db709277fae0887be46.tar.xz
mediagoblin-e49b7e02b2150413d2e78db709277fae0887be46.zip
Use six.text_type instead of unicode().
I will be switch to use ``from __future__ import unicode_literals`` later.
Diffstat (limited to 'mediagoblin/tests/test_auth.py')
-rw-r--r--mediagoblin/tests/test_auth.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/mediagoblin/tests/test_auth.py b/mediagoblin/tests/test_auth.py
index e8fd76d8..9b7f9825 100644
--- a/mediagoblin/tests/test_auth.py
+++ b/mediagoblin/tests/test_auth.py
@@ -18,6 +18,8 @@
import pkg_resources
import pytest
+import six
+
import six.moves.urllib.parse as urlparse
from mediagoblin import mg_globals
@@ -109,7 +111,7 @@ def test_register_views(test_app):
## Make sure user is logged in
request = template.TEMPLATE_TEST_CONTEXT[
'mediagoblin/user_pages/user_nonactive.html']['request']
- assert request.session['user_id'] == unicode(new_user.id)
+ assert request.session['user_id'] == six.text_type(new_user.id)
## Make sure we get email confirmation, and try verifying
assert len(mail.EMAIL_TEST_INBOX) == 1
@@ -307,7 +309,7 @@ def test_authentication_views(test_app):
# Make sure user is in the session
context = template.TEMPLATE_TEST_CONTEXT['mediagoblin/root.html']
session = context['request'].session
- assert session['user_id'] == unicode(test_user.id)
+ assert session['user_id'] == six.text_type(test_user.id)
# Successful logout
# -----------------