Merge lp:~ricardokirkner/django-openid-auth/py35-support into lp:django-openid-auth

[Ricardo Kirkner]

support python 2.7 and 3.5

[Matias Bordese (matiasb)]

LGTM, nice.

review: Approve

[Otto Co-Pilot (otto-copilot)]

Running landing tests failed
https://jenkins.ols.canonical.com/online-services/job/django-openid-auth/12/

[Matias Bordese (matiasb)]

Makes sense.

review: Approve

[Otto Co-Pilot (otto-copilot)]

Running landing tests failed
https://jenkins.ols.canonical.com/online-services/job/django-openid-auth/14/

[Otto Co-Pilot (otto-copilot)]

Running landing tests failed
https://jenkins.ols.canonical.com/online-services/job/django-openid-auth/16/

[Otto Co-Pilot (otto-copilot)]

Running landing tests failed
https://jenkins.ols.canonical.com/online-services/job/django-openid-auth/18/

[Otto Co-Pilot (otto-copilot)]

Running landing tests failed
https://jenkins.ols.canonical.com/online-services/job/django-openid-auth/19/

[lp:~ricardokirkner/django-openid-auth/py35-support]

133. By Ricardo Kirkner on 2017-04-03

fixed typo in env name

=== modified file 'django_openid_auth/__init__.py'
--- django_openid_auth/__init__.py	2015-04-23 20:02:39 +0000
+++ django_openid_auth/__init__.py	2017-04-03 12:33:16 +0000
@@ -26,3 +26,6 @@
 # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
 # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
+import sys
+
+PY3 = sys.version_info.major >= 3
 
=== modified file 'django_openid_auth/admin.py'
--- django_openid_auth/admin.py	2015-09-21 14:32:58 +0000
+++ django_openid_auth/admin.py	2017-04-03 12:33:16 +0000
@@ -29,8 +29,11 @@
 
 from __future__ import unicode_literals
 
-from urllib import urlencode
-from urlparse import parse_qsl, urlparse
+try:
+    from urllib.parse import parse_qsl, urlencode, urlparse
+except ImportError:
+    from urllib import urlencode
+    from urlparse import parse_qsl, urlparse
 
 from django.conf import settings
 from django.contrib import admin
@@ -50,6 +53,7 @@
         self.message_user(request, "%d expired nonces removed" % count)
     cleanup_nonces.short_description = "Clean up expired nonces"
 
+
 admin.site.register(Nonce, NonceAdmin)
 
 
@@ -65,6 +69,7 @@
         self.message_user(request, "%d expired associations removed" % count)
     cleanup_associations.short_description = "Clean up expired associations"
 
+
 admin.site.register(Association, AssociationAdmin)
 
 
@@ -73,6 +78,7 @@
     list_display = ('user', 'claimed_id')
     search_fields = ('claimed_id',)
 
+
 admin.site.register(UserOpenID, UserOpenIDAdmin)
 
 
 
=== modified file 'django_openid_auth/auth.py'
--- django_openid_auth/auth.py	2017-01-23 14:26:49 +0000
+++ django_openid_auth/auth.py	2017-04-03 12:33:16 +0000
@@ -408,7 +408,8 @@
             teams_mapping[lp_team] for lp_team in teams_response.is_member
             if lp_team in teams_mapping]
         user_groups = UserGroup.objects.filter(user=user)
-        matching_groups = user_groups.filter(group__name__in=teams_mapping.values())
+        matching_groups = user_groups.filter(
+            group__name__in=teams_mapping.values())
         current_groups = set(
             user_group.group for user_group in matching_groups)
         desired_groups = set(Group.objects.filter(name__in=mapping))
 
=== modified file 'django_openid_auth/forms.py'
--- django_openid_auth/forms.py	2015-04-23 20:39:02 +0000
+++ django_openid_auth/forms.py	2017-04-03 12:33:16 +0000
@@ -38,6 +38,8 @@
 
 from openid.yadis import xri
 
+from django_openid_auth import PY3
+
 
 def teams_new_unicode(self):
     """
@@ -52,8 +54,13 @@
     else:
         return name
 
-Group.unicode_before_teams = Group.__unicode__
-Group.__unicode__ = teams_new_unicode
+
+if PY3:
+    Group.unicode_before_teams = Group.__str__
+    Group.__str__ = teams_new_unicode
+else:
+    Group.unicode_before_teams = Group.__unicode__
+    Group.__unicode__ = teams_new_unicode
 
 
 class UserChangeFormWithTeamRestriction(UserChangeForm):
@@ -72,6 +79,7 @@
                     "You cannot assign it manually." % group.name)
         return data
 
+
 UserAdmin.form = UserChangeFormWithTeamRestriction
 
 
 
=== modified file 'django_openid_auth/store.py'
--- django_openid_auth/store.py	2015-04-23 20:39:02 +0000
+++ django_openid_auth/store.py	2017-04-03 12:33:16 +0000
@@ -36,6 +36,7 @@
 from openid.store.interface import OpenIDStore
 from openid.store.nonce import SKEW
 
+from django_openid_auth import PY3
 from django_openid_auth.models import Association, Nonce
 
 
@@ -75,10 +76,15 @@
         expired = []
         for assoc in assocs:
             association = OIDAssociation(
-                assoc.handle, base64.decodestring(assoc.secret), assoc.issued,
-                assoc.lifetime, assoc.assoc_type
+                assoc.handle,
+                base64.decodestring(assoc.secret.encode('utf-8')),
+                assoc.issued, assoc.lifetime, assoc.assoc_type
             )
-            if association.getExpiresIn() == 0:
+            if PY3:
+                expires_in = association.expiresIn
+            else:
+                expires_in = association.getExpiresIn()
+            if expires_in == 0:
                 expired.append(assoc)
             else:
                 associations.append((association.issued, association))
 
=== modified file 'django_openid_auth/teams.py'
--- django_openid_auth/teams.py	2015-04-23 20:39:02 +0000
+++ django_openid_auth/teams.py	2017-04-03 12:33:16 +0000
@@ -72,6 +72,7 @@
     registerNamespaceAlias,
     NamespaceAliasRegistrationError,
 )
+from six import string_types
 
 __all__ = [
     'TeamsRequest',
@@ -84,7 +85,7 @@
 
 try:
     registerNamespaceAlias(ns_uri, 'lp')
-except NamespaceAliasRegistrationError, e:
+except NamespaceAliasRegistrationError as e:
     oidutil.log(
         'registerNamespaceAlias(%r, %r) failed: %s' % (ns_uri, 'lp', str(e)))
 
@@ -139,7 +140,7 @@
         # There is no alias, so try to add one. (OpenID version 1)
         try:
             message.namespaces.addAlias(ns_uri, 'lp')
-        except KeyError, why:
+        except KeyError as why:
             # An alias for the string 'lp' already exists, but it's
             # defined for something other than Launchpad teams
             raise TeamsNamespaceError(why[0])
@@ -287,7 +288,7 @@
         @raise ValueError: when a team requested is not a string
             or strict is set and a team was requested more than once
         """
-        if isinstance(query_membership, basestring):
+        if isinstance(query_membership, string_types):
             raise TypeError('Teams should be passed as a list of '
                             'strings (not %r)' % (type(query_membership),))
 
 
=== modified file 'django_openid_auth/tests/test_auth.py'
--- django_openid_auth/tests/test_auth.py	2017-01-20 14:28:12 +0000
+++ django_openid_auth/tests/test_auth.py	2017-04-03 12:33:16 +0000
@@ -29,15 +29,16 @@
 from __future__ import unicode_literals
 
 import re
-from urlparse import urljoin
+try:
+    from urllib.parse import urljoin
+except ImportError:
+    from urlparse import urljoin
 
 from django.conf import settings
 from django.contrib.auth.models import Group, Permission, User
 from django.core.exceptions import ImproperlyConfigured
-from django.db import models
 from django.test import TestCase
 from django.test.utils import override_settings
-from mock import patch
 from openid.consumer.consumer import (
     CancelResponse,
     FailureResponse,
@@ -160,7 +161,8 @@
         perm_label = '%s.%s' % (permission.content_type.app_label,
                                 permission.codename)
         # Always invalidate the per-request perm cache
-        for attr in user.__dict__.keys():
+        attrs = list(user.__dict__.keys())
+        for attr in attrs:
             if attr.endswith('_perm_cache'):
                 delattr(user, attr)
 
 
=== modified file 'django_openid_auth/tests/test_store.py'
--- django_openid_auth/tests/test_store.py	2015-04-23 20:39:02 +0000
+++ django_openid_auth/tests/test_store.py	2017-04-03 12:33:16 +0000
@@ -28,6 +28,7 @@
 
 from __future__ import unicode_literals
 
+import base64
 import time
 
 from django.test import TestCase
@@ -52,7 +53,8 @@
             server_url='server-url', handle='handle')
         self.assertEquals(dbassoc.server_url, 'server-url')
         self.assertEquals(dbassoc.handle, 'handle')
-        self.assertEquals(dbassoc.secret, 'secret'.encode('base-64'))
+        self.assertEquals(
+            dbassoc.secret, base64.encodestring(b'secret').decode('utf-8'))
         self.assertEquals(dbassoc.issued, 42)
         self.assertEquals(dbassoc.lifetime, 600)
         self.assertEquals(dbassoc.assoc_type, 'HMAC-SHA1')
@@ -66,7 +68,8 @@
         self.store.storeAssociation('server-url', assoc)
         dbassoc = Association.objects.get(
             server_url='server-url', handle='handle')
-        self.assertEqual(dbassoc.secret, 'secret2'.encode('base-64'))
+        self.assertEqual(
+            dbassoc.secret, base64.encodestring(b'secret2').decode('utf-8'))
         self.assertEqual(dbassoc.issued, 420)
         self.assertEqual(dbassoc.lifetime, 900)
         self.assertEqual(dbassoc.assoc_type, 'HMAC-SHA256')
@@ -80,7 +83,7 @@
         self.assertTrue(isinstance(assoc, OIDAssociation))
 
         self.assertEquals(assoc.handle, 'handle')
-        self.assertEquals(assoc.secret, 'secret')
+        self.assertEquals(assoc.secret, b'secret')
         self.assertEquals(assoc.issued, timestamp)
         self.assertEquals(assoc.lifetime, 600)
         self.assertEquals(assoc.assoc_type, 'HMAC-SHA1')
 
=== modified file 'django_openid_auth/tests/test_views.py'
--- django_openid_auth/tests/test_views.py	2017-01-16 15:05:26 +0000
+++ django_openid_auth/tests/test_views.py	2017-04-03 12:33:16 +0000
@@ -31,7 +31,10 @@
 
 import cgi
 
-from urlparse import parse_qs
+try:
+    from urllib.parse import parse_qs
+except ImportError:
+    from urlparse import parse_qs
 
 from django.conf import settings
 from django.contrib.auth.models import User, Group, Permission
@@ -125,8 +128,8 @@
     def parseFormPost(self, content):
         """Parse an HTML form post to create an OpenID request."""
         # Hack to make the javascript XML compliant ...
-        content = content.replace('i < elements.length',
-                                  'i &lt; elements.length')
+        content = content.replace(
+            'i < elements.length', 'i &lt; elements.length')
         tree = ET.XML(content)
         form = tree.find('.//form')
         assert form is not None, 'No form in document'
@@ -137,8 +140,7 @@
         for input in form.findall('input'):
             if input.get('type') != 'hidden':
                 continue
-            query[input.get('name').encode('UTF-8')] = \
-                input.get('value').encode('UTF-8')
+            query[input.get('name')] = input.get('value')
         self.last_request = self.server.decodeRequest(query)
         return self.last_request
 
@@ -236,7 +238,8 @@
         response = self.client.post(self.login_url, self.openid_req)
         self.assertContains(response, 'OpenID transaction in progress')
 
-        openid_request = self.provider.parseFormPost(response.content)
+        openid_request = self.provider.parseFormPost(
+            response.content.decode('utf-8'))
         self.assertEqual(openid_request.mode, 'checkid_setup')
         self.assertTrue(openid_request.return_to.startswith(
             'http://testserver/openid/complete/'))
@@ -248,7 +251,7 @@
 
         # And they are now logged in:
         response = self.client.get('/getuser/')
-        self.assertEqual(response.content, 'someuser')
+        self.assertEqual(response.content.decode('utf-8'), 'someuser')
 
     def test_login_with_nonascii_return_to(self):
         """Ensure non-ascii characters can be used for the 'next' arg."""
@@ -270,7 +273,8 @@
 
         self.assertContains(response, 'OpenID transaction in progress')
 
-        openid_request = self.provider.parseFormPost(response.content)
+        openid_request = self.provider.parseFormPost(
+            response.content.decode('utf-8'))
         self.assertEqual(openid_request.mode, 'checkid_setup')
         self.assertTrue(openid_request.return_to.startswith(
             'http://testserver/openid/complete/'))
@@ -297,7 +301,8 @@
         self.assertEqual(response.status_code, 200)
         self.assertContains(response, 'OpenID transaction in progress')
 
-        openid_request = self.provider.parseFormPost(response.content)
+        openid_request = self.provider.parseFormPost(
+            response.content.decode('utf-8'))
         self.assertEqual(openid_request.mode, 'checkid_setup')
         self.assertTrue(openid_request.return_to.startswith(
             'http://testserver/openid/complete/'))
@@ -309,7 +314,7 @@
 
         # And they are now logged in:
         response = self.client.get('/getuser/')
-        self.assertEqual(response.content, 'someuser')
+        self.assertEqual(response.content.decode('utf-8'), 'someuser')
 
     def test_login_create_users(self):
         # Create a user with the same name as we'll pass back via sreg.
@@ -321,7 +326,8 @@
 
         # Complete the request, passing back some simple registration
         # data.  The user is redirected to the next URL.
-        openid_request = self.provider.parseFormPost(response.content)
+        openid_request = self.provider.parseFormPost(
+            response.content.decode('utf-8'))
         sreg_request = sreg.SRegRequest.fromOpenIDRequest(openid_request)
         openid_response = openid_request.answer(True)
         sreg_response = sreg.SRegResponse.extractResponse(
@@ -335,7 +341,7 @@
         # And they are now logged in as a new user (they haven't taken
         # over the existing "someuser" user).
         response = self.client.get('/getuser/')
-        self.assertEqual(response.content, 'someuser2')
+        self.assertEqual(response.content.decode('utf-8'), 'someuser2')
 
         # Check the details of the new user.
         user = User.objects.get(username='someuser2')
@@ -359,7 +365,8 @@
 
         # Complete the request, passing back some simple registration
         # data.  The user is redirected to the next URL.
-        openid_request = self.provider.parseFormPost(response.content)
+        openid_request = self.provider.parseFormPost(
+            response.content.decode('utf-8'))
         return openid_request
 
     def _get_login_response(self, openid_request, resp_data, use_sreg,
@@ -383,7 +390,8 @@
         self.provider.type_uris.append(pape.ns_uri)
 
         response = self.client.post(self.login_url, self.openid_req)
-        openid_request = self.provider.parseFormPost(response.content)
+        openid_request = self.provider.parseFormPost(
+            response.content.decode('utf-8'))
 
         request_auth = openid_request.message.getArg(
             'http://specs.openid.net/extensions/pape/1.0',
@@ -431,7 +439,7 @@
             query['openid.pape.auth_policies'], [preferred_auth])
 
         response = self.client.get('/getuser/')
-        self.assertEqual(response.content, 'testuser')
+        self.assertEqual(response.content.decode('utf-8'), 'testuser')
 
     @override_settings(OPENID_PHYSICAL_MULTIFACTOR_REQUIRED=True)
     def test_login_physical_multifactor_not_provided(self):
@@ -547,10 +555,11 @@
             response = self.client.get('/getuser/')
 
         # username defaults to 'openiduser'
-        self.assertEqual(response.content, 'openiduser')
+        username = response.content.decode('utf-8')
+        self.assertEqual(username, 'openiduser')
 
         # The user's full name and email have been updated.
-        user = User.objects.get(username=response.content)
+        user = User.objects.get(username=username)
         self.assertEqual(user.first_name, 'Openid')
         self.assertEqual(user.last_name, 'User')
         self.assertEqual(user.email, '[e-mail]')
@@ -565,7 +574,7 @@
             response = self.client.get('/getuser/')
 
         # username defaults to a munged version of the email
-        self.assertEqual(response.content, 'fooexamplecom')
+        self.assertEqual(response.content.decode('utf-8'), 'fooexamplecom')
 
     def test_login_duplicate_username_numbering(self):
         # Setup existing user who's name we're going to conflict with
@@ -582,7 +591,7 @@
 
         # Since this username is already taken by someone else, we go through
         # the process of adding +i to it, and get testuser2.
-        self.assertEqual(response.content, 'testuser2')
+        self.assertEqual(response.content.decode('utf-8'), 'testuser2')
 
     def test_login_duplicate_username_numbering_with_conflicts(self):
         # Setup existing user who's name we're going to conflict with
@@ -602,7 +611,7 @@
         # the process of adding +i to it starting with the count of users with
         # username starting with 'testuser', of which there are 2.  i should
         # start at 3, which already exists, so it should skip to 4.
-        self.assertEqual(response.content, 'testuser4')
+        self.assertEqual(response.content.decode('utf-8'), 'testuser4')
 
     def test_login_duplicate_username_numbering_with_holes(self):
         # Setup existing user who's name we're going to conflict with
@@ -625,7 +634,7 @@
         # the process of adding +i to it starting with the count of users with
         # username starting with 'testuser', of which there are 5.  i should
         # start at 6, and increment until it reaches 9.
-        self.assertEqual(response.content, 'testuser9')
+        self.assertEqual(response.content.decode('utf-8'), 'testuser9')
 
     def test_login_duplicate_username_numbering_with_nonsequential_matches(
             self):
@@ -646,7 +655,7 @@
         # the process of adding +i to it starting with the count of users with
         # username starting with 'testuser', of which there are 2.  i should
         # start at 3, which will be available.
-        self.assertEqual(response.content, 'testuser3')
+        self.assertEqual(response.content.decode('utf-8'), 'testuser3')
 
     def test_login_follow_rename(self):
         user = User.objects.create_user('testuser', '[e-mail]')
@@ -666,10 +675,11 @@
 
         # If OPENID_FOLLOW_RENAMES, they are logged in as
         # someuser (the passed in nickname has changed the username)
-        self.assertEqual(response.content, 'someuser')
+        username = response.content.decode('utf-8')
+        self.assertEqual(username, 'someuser')
 
         # The user's full name and email have been updated.
-        user = User.objects.get(username=response.content)
+        user = User.objects.get(username=username)
         self.assertEqual(user.first_name, 'Some')
         self.assertEqual(user.last_name, 'User')
         self.assertEqual(user.email, '[e-mail]')
@@ -691,10 +701,11 @@
             response = self.client.get('/getuser/')
 
         # Username should not have changed
-        self.assertEqual(response.content, 'testuser')
+        username = response.content.decode('utf-8')
+        self.assertEqual(username, 'testuser')
 
         # The user's full name and email have been updated.
-        user = User.objects.get(username=response.content)
+        user = User.objects.get(username=username)
         self.assertEqual(user.first_name, 'Some')
         self.assertEqual(user.last_name, 'User')
         self.assertEqual(user.email, '[e-mail]')
@@ -730,10 +741,11 @@
         # If OPENID_FOLLOW_RENAMES, attempt to change username to 'testuser'
         # but since that username is already taken by someone else, we go
         # through the process of adding +i to it, and get testuser2.
-        self.assertEqual(response.content, 'testuser2')
+        username = response.content.decode('utf-8')
+        self.assertEqual(username, 'testuser2')
 
         # The user's full name and email have been updated.
-        user = User.objects.get(username=response.content)
+        user = User.objects.get(username=username)
         self.assertEqual(user.first_name, 'Rename')
         self.assertEqual(user.last_name, 'User')
         self.assertEqual(user.email, '[e-mail]')
@@ -772,10 +784,11 @@
         # the username follows the nickname+i scheme, it has non-numbers in the
         # suffix, so it's not an auto-generated one.  The regular process of
         # renaming to 'testuser' has a conflict, so we get +2 at the end.
-        self.assertEqual(response.content, 'testuser2')
+        username = response.content.decode('utf-8')
+        self.assertEqual(username, 'testuser2')
 
         # The user's full name and email have been updated.
-        user = User.objects.get(username=response.content)
+        user = User.objects.get(username=username)
         self.assertEqual(user.first_name, 'Rename')
         self.assertEqual(user.last_name, 'User')
         self.assertEqual(user.email, '[e-mail]')
@@ -812,10 +825,11 @@
         # but since that username is already taken by someone else, we go
         # through the process of adding +i to it.  Since the user for this
         # identity url already has a name matching that pattern, check if first
-        self.assertEqual(response.content, 'testuser2000')
+        username = response.content.decode('utf-8')
+        self.assertEqual(username, 'testuser2000')
 
         # The user's full name and email have been updated.
-        user = User.objects.get(username=response.content)
+        user = User.objects.get(username=username)
         self.assertEqual(user.first_name, 'Rename')
         self.assertEqual(user.last_name, 'User')
         self.assertEqual(user.email, '[e-mail]')
@@ -842,10 +856,11 @@
 
         # If OPENID_FOLLOW_RENAMES, username should be changed to 'testuser'
         # because it wasn't currently taken
-        self.assertEqual(response.content, 'testuser')
+        username = response.content.decode('utf-8')
+        self.assertEqual(username, 'testuser')
 
         # The user's full name and email have been updated.
-        user = User.objects.get(username=response.content)
+        user = User.objects.get(username=username)
         self.assertEqual(user.first_name, 'Same')
         self.assertEqual(user.last_name, 'User')
         self.assertEqual(user.email, '[e-mail]')
@@ -860,7 +875,8 @@
 
         # Complete the request, passing back some simple registration
         # data.  The user is redirected to the next URL.
-        openid_request = self.provider.parseFormPost(response.content)
+        openid_request = self.provider.parseFormPost(
+            response.content.decode('utf-8'))
         sreg_request = sreg.SRegRequest.fromOpenIDRequest(openid_request)
         openid_response = openid_request.answer(True)
         sreg_response = sreg.SRegResponse.extractResponse(
@@ -898,7 +914,8 @@
 
         # Complete the request, passing back some simple registration
         # data.  The user is redirected to the next URL.
-        openid_request = self.provider.parseFormPost(response.content)
+        openid_request = self.provider.parseFormPost(
+            response.content.decode('utf-8'))
         sreg_request = sreg.SRegRequest.fromOpenIDRequest(openid_request)
         openid_response = openid_request.answer(True)
         sreg_response = sreg.SRegResponse.extractResponse(
@@ -927,7 +944,8 @@
 
         # Complete the request, passing back some simple registration
         # data.  The user is redirected to the next URL.
-        openid_request = self.provider.parseFormPost(response.content)
+        openid_request = self.provider.parseFormPost(
+            response.content.decode('utf-8'))
         sreg_request = sreg.SRegRequest.fromOpenIDRequest(openid_request)
         openid_response = openid_request.answer(True)
         sreg_response = sreg.SRegResponse.extractResponse(
@@ -969,7 +987,8 @@
 
         # Complete the request, passing back some simple registration
         # data.  The user is redirected to the next URL.
-        openid_request = self.provider.parseFormPost(response.content)
+        openid_request = self.provider.parseFormPost(
+            response.content.decode('utf-8'))
         sreg_request = sreg.SRegRequest.fromOpenIDRequest(openid_request)
         openid_response = openid_request.answer(True)
         sreg_response = sreg.SRegResponse.extractResponse(
@@ -992,7 +1011,8 @@
 
         # Complete the request, passing back some simple registration
         # data.  The user is redirected to the next URL.
-        openid_request = self.provider.parseFormPost(response.content)
+        openid_request = self.provider.parseFormPost(
+            response.content.decode('utf-8'))
         sreg_request = sreg.SRegRequest.fromOpenIDRequest(openid_request)
         openid_response = openid_request.answer(True)
         sreg_response = sreg.SRegResponse.extractResponse(
@@ -1028,10 +1048,11 @@
             self._do_user_login(self.openid_req, self.openid_resp)
             response = self.client.get('/getuser/')
 
-        self.assertEqual(response.content, 'testuser')
+        username = response.content.decode('utf-8')
+        self.assertEqual(username, 'testuser')
 
         # The user's full name and email have been updated.
-        user = User.objects.get(username=response.content)
+        user = User.objects.get(username=username)
         self.assertEqual(user.first_name, 'Some')
         self.assertEqual(user.last_name, 'User')
         self.assertEqual(user.email, '[e-mail]')
@@ -1047,7 +1068,8 @@
         with self.settings(OPENID_SREG_EXTRA_FIELDS=('language',)):
             response = self.client.post(self.login_url, self.openid_req)
 
-        openid_request = self.provider.parseFormPost(response.content)
+        openid_request = self.provider.parseFormPost(
+            response.content.decode('utf-8'))
         sreg_request = sreg.SRegRequest.fromOpenIDRequest(openid_request)
         for field in ('email', 'fullname', 'nickname', 'language'):
             self.assertTrue(field in sreg_request)
@@ -1064,7 +1086,8 @@
         with self.settings(OPENID_SREG_REQUIRED_FIELDS=('email', 'language')):
             response = self.client.post(self.login_url, self.openid_req)
 
-        openid_request = self.provider.parseFormPost(response.content)
+        openid_request = self.provider.parseFormPost(
+            response.content.decode('utf-8'))
         sreg_request = sreg.SRegRequest.fromOpenIDRequest(openid_request)
 
         self.assertEqual(['email', 'language'], sreg_request.required)
@@ -1086,7 +1109,8 @@
 
         # The resulting OpenID request uses the Attribute Exchange
         # extension rather than the Simple Registration extension.
-        openid_request = self.provider.parseFormPost(response.content)
+        openid_request = self.provider.parseFormPost(
+            response.content.decode('utf-8'))
         sreg_request = sreg.SRegRequest.fromOpenIDRequest(openid_request)
         self.assertEqual(sreg_request.required, [])
         self.assertEqual(sreg_request.optional, [])
@@ -1132,7 +1156,7 @@
         assert not settings.OPENID_FOLLOW_RENAMES, (
             'OPENID_FOLLOW_RENAMES must be False')
         response = self.client.get('/getuser/')
-        self.assertEqual(response.content, 'testuser')
+        self.assertEqual(response.content.decode('utf-8'), 'testuser')
 
         # The user's full name and email have been updated.
         user = User.objects.get(username='testuser')
@@ -1216,7 +1240,8 @@
         self.assertContains(response, 'OpenID transaction in progress')
 
         # Complete the request
-        openid_request = self.provider.parseFormPost(response.content)
+        openid_request = self.provider.parseFormPost(
+            response.content.decode('utf-8'))
         openid_response = openid_request.answer(True)
         teams_request = teams.TeamsRequest.fromOpenIDRequest(openid_request)
         teams_response = teams.TeamsResponse.extractResponse(
@@ -1231,7 +1256,7 @@
 
         # And they are now logged in as testuser
         response = self.client.get('/getuser/')
-        self.assertEqual(response.content, 'testuser')
+        self.assertEqual(response.content.decode('utf-8'), 'testuser')
 
         # The user's groups have been updated.
         User.objects.get(username='testuser')
@@ -1263,7 +1288,8 @@
                 OPENID_LAUNCHPAD_TEAMS_MAPPING=mapping,
                 OPENID_LAUNCHPAD_TEAMS_MAPPING_AUTO=True,
                 OPENID_LAUNCHPAD_TEAMS_MAPPING_AUTO_BLACKLIST=blacklist):
-            openid_request = self.provider.parseFormPost(response.content)
+            openid_request = self.provider.parseFormPost(
+                response.content.decode('utf-8'))
             openid_request.answer(True)
             teams.TeamsRequest.fromOpenIDRequest(openid_request)
 
@@ -1316,7 +1342,8 @@
         response = self.client.post(self.login_url, self.openid_req_no_next)
 
         # Complete the request
-        openid_request = self.provider.parseFormPost(response.content)
+        openid_request = self.provider.parseFormPost(
+            response.content.decode('utf-8'))
         openid_response = openid_request.answer(True)
         teams_request = teams.TeamsRequest.fromOpenIDRequest(openid_request)
         teams_response = teams.TeamsResponse.extractResponse(
@@ -1335,7 +1362,8 @@
             display_id='http://example.com/identity')
 
         response = self.client.post(self.login_url, self.openid_req_no_next)
-        openid_request = self.provider.parseFormPost(response.content)
+        openid_request = self.provider.parseFormPost(
+            response.content.decode('utf-8'))
         openid_response = openid_request.answer(True)
         # Use a closure to test whether the signal handler was called.
         self.signal_handler_called = False
 
=== modified file 'django_openid_auth/views.py'
--- django_openid_auth/views.py	2017-01-16 14:34:06 +0000
+++ django_openid_auth/views.py	2017-04-03 12:33:16 +0000
@@ -30,8 +30,11 @@
 from __future__ import unicode_literals
 
 import re
-import urllib
-from urlparse import urlsplit
+try:
+    from urllib.parse import urlencode, urlsplit
+except ImportError:
+    from urllib import urlencode
+    from urlparse import urlsplit
 
 from django.conf import settings
 from django.contrib.auth import (
@@ -177,7 +180,10 @@
         # Invalid or no form data:
         if openid_url is None:
             context = RequestContext(request)
-            context.update({'form': login_form, redirect_field_name: redirect_to})
+            context.update({
+                'form': login_form,
+                redirect_field_name: redirect_to,
+            })
             return render_to_response(template_name, context)
 
     consumer = make_consumer(request)
@@ -274,7 +280,7 @@
         # Django gives us Unicode, which is great.  We must encode URI.
         # urllib enforces str. We can't trust anything about the default
         # encoding inside  str(foo) , so we must explicitly make foo a str.
-        return_to += urllib.urlencode(
+        return_to += urlencode(
             {redirect_field_name: redirect_to.encode("UTF-8")})
 
     return render_openid_request(request, openid_request, return_to)
@@ -297,8 +303,9 @@
     if openid_response.status == SUCCESS:
         try:
             user = authenticate(openid_response=openid_response)
-        except DjangoOpenIDException, e:
-            return render_failure(request, e.message, exception=e)
+        except DjangoOpenIDException as e:
+            return render_failure(
+                request, getattr(e, 'message', str(e)), exception=e)
 
         if user is not None:
             if user.is_active:
@@ -332,6 +339,7 @@
         OPENID_LOGO_BASE_64.decode('base64'), mimetype='image/gif'
     )
 
+
 # Logo from http://openid.net/login-bg.gif
 # Embedded here for convenience; you should serve this as a static file
 OPENID_LOGO_BASE_64 = """
 
=== modified file 'example_consumer/urls.py'
--- example_consumer/urls.py	2017-01-16 12:22:28 +0000
+++ example_consumer/urls.py	2017-04-03 12:33:16 +0000
@@ -31,7 +31,7 @@
 from django.contrib import admin
 from django.contrib.auth import views as auth_views
 
-import views
+from example_consumer import views
 
 
 admin.autodiscover()
 
=== removed file 'setup.cfg'
--- setup.cfg	2017-01-23 15:23:51 +0000
+++ setup.cfg	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-[wheel]
-universal = True
 
=== modified file 'setup.py'
--- setup.py	2017-01-20 20:25:07 +0000
+++ setup.py	2017-04-03 12:33:16 +0000
@@ -39,21 +39,28 @@
     info.
 """
 
+import sys
+
 from setuptools import find_packages, setup
 
+PY3 = sys.version_info.major >= 3
+
 
 description, long_description = __doc__.split('\n\n', 1)
-VERSION = '0.13'
+VERSION = '0.14'
+
+install_requires = ['django>=1.6', 'six']
+if PY3:
+    install_requires.append('python3-openid')
+else:
+    install_requires.append('python-openid>=2.2.0')
 
 setup(
     name='django-openid-auth',
     version=VERSION,
 
     packages=find_packages(),
-    install_requires=[
-        'django>=1.6',
-        'python-openid>=2.2.0',
-    ],
+    install_requires=install_requires,
     package_data={
         'django_openid_auth': ['templates/openid/*.html'],
     },
 
=== modified file 'tox.ini'
--- tox.ini	2017-01-20 20:31:51 +0000
+++ tox.ini	2017-04-03 12:33:16 +0000
@@ -1,36 +1,51 @@
 [tox]
-envlist = py27-django1.6,py27-django1.7,py27-django1.8,py27-django1.9,py27-django1.10
+envlist =
+    py27-django1.6,py27-django1.7,py27-django1.8,py27-django1.9,py27-django1.10,py3-django1.10
 
 [testenv]
 commands = python manage.py test django_openid_auth
-basepython =
-    python2.7
-deps=
+deps =
     mock
+
+[testenv:py27]
+basepython = python2.7
+deps =
     python-openid
+    {[testenv]deps}
+
+[testenv:py3]
+basepython = python3
+deps =
+    python3-openid
+    {[testenv]deps}
 
 [testenv:py27-django1.6]
 deps =
     django == 1.6.11
     south
-    {[testenv]deps}
+    {[testenv:py27]deps}
 
 [testenv:py27-django1.7]
 deps =
     django == 1.7.11
-    {[testenv]deps}
+    {[testenv:py27]deps}
 
 [testenv:py27-django1.8]
 deps =
     django == 1.8.17
-    {[testenv]deps}
+    {[testenv:py27]deps}
 
 [testenv:py27-django1.9]
 deps =
     django == 1.9.12
-    {[testenv]deps}
+    {[testenv:py27]deps}
 
 [testenv:py27-django1.10]
 deps =
-    django == 1.10.5
-    {[testenv]deps}
+    django == 1.10.6
+    {[testenv:py27]deps}
+
+[testenv:py3-django1.10]
+deps =
+    django == 1.10.6
+    {[testenv:py3]deps}