Merge lp:~cjohnston/ubuntu/raring/django-openid-auth/release-0-5 into lp:ubuntu/raring/django-openid-auth

[Chris Johnston]

* Fixes tests failing with django 1.4
* Fixes AttributeError when not having admin access (LP: #897651)
* Fixes UnicodeError when handling redirect (LP: #936153)
* Changed UserOpenID.user admin widget to raw_id (LP: #873338)
* Strip non-alphanumeric characters out of email for better username suggestions (LP: #1007281)
* skip ahead to a number that is likely available when generating a sequence number to append to a duplicate username

[Chris Johnston (cjohnston)]

I have built and tested this update.

[Chris Johnston (cjohnston)]

https://launchpad.net/~chrisjohnston/+archive/ppa/+build/4400062

[Daniel Holbach (dholbach)]

Maybe it'd be worth pointing out in the changelog that openid.txt was dropped from debian/docs and why fix_settings_database.patch was removed as well.

review: Needs Information

[Chris Johnston (cjohnston)]

review: Needs Resubmitting

[Daniel Holbach (dholbach)]

Uploaded. Thanks.

review: Approve

=== removed directory '.pc'
=== removed file '.pc/.quilt_patches'
--- .pc/.quilt_patches	2012-07-02 12:31:05 +0000
+++ .pc/.quilt_patches	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-debian/patches

=== removed file '.pc/.quilt_series'
--- .pc/.quilt_series	2012-07-02 12:31:05 +0000
+++ .pc/.quilt_series	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-series

=== removed file '.pc/.version'
--- .pc/.version	2012-06-27 08:25:19 +0000
+++ .pc/.version	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-2

=== removed file '.pc/applied-patches'
--- .pc/applied-patches	2012-06-27 08:25:19 +0000
+++ .pc/applied-patches	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-fix_settings_database.patch

=== removed directory '.pc/fix_settings_database.patch'
=== removed directory '.pc/fix_settings_database.patch/example_consumer'
=== removed file '.pc/fix_settings_database.patch/example_consumer/settings.py'
--- .pc/fix_settings_database.patch/example_consumer/settings.py	2012-06-27 08:25:19 +0000
+++ .pc/fix_settings_database.patch/example_consumer/settings.py	1970-01-01 00:00:00 +0000
@@ -1,143 +0,0 @@
-# django-openid-auth -  OpenID integration for django.contrib.auth
-#
-# Copyright (C) 2007 Simon Willison
-# Copyright (C) 2008-2010 Canonical Ltd.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# * Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# 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.
-
-# Django settings for example project.
-
-DEBUG = True
-TEMPLATE_DEBUG = DEBUG
-
-ADMINS = (
-    # ('Your Name', '[e-mail]'),
-)
-
-MANAGERS = ADMINS
-
-DATABASE_ENGINE = 'sqlite3'           # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'ado_mssql'.
-DATABASE_NAME = 'sqlite.db'             # Or path to database file if using sqlite3.
-DATABASE_USER = ''             # Not used with sqlite3.
-DATABASE_PASSWORD = ''         # Not used with sqlite3.
-DATABASE_HOST = ''             # Set to empty string for localhost. Not used with sqlite3.
-DATABASE_PORT = ''             # Set to empty string for default. Not used with sqlite3.
-
-# Local time zone for this installation. Choices can be found here:
-# http://www.postgresql.org/docs/8.1/static/datetime-keywords.html#DATETIME-TIMEZONE-SET-TABLE
-# although not all variations may be possible on all operating systems.
-# If running in a Windows environment this must be set to the same as your
-# system time zone.
-TIME_ZONE = 'America/Chicago'
-
-# Language code for this installation. All choices can be found here:
-# http://www.w3.org/TR/REC-html40/struct/dirlang.html#langcodes
-# http://blogs.law.harvard.edu/tech/stories/storyReader$15
-LANGUAGE_CODE = 'en-us'
-
-SITE_ID = 1
-
-# If you set this to False, Django will make some optimizations so as not
-# to load the internationalization machinery.
-USE_I18N = True
-
-# Absolute path to the directory that holds media.
-# Example: "/home/media/media.lawrence.com/"
-MEDIA_ROOT = ''
-
-# URL that handles the media served from MEDIA_ROOT.
-# Example: "http://media.lawrence.com"
-MEDIA_URL = ''
-
-# URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
-# trailing slash.
-# Examples: "http://foo.com/media/", "/media/".
-ADMIN_MEDIA_PREFIX = '/media/'
-
-# Make this unique, and don't share it with anybody.
-SECRET_KEY = '34958734985734985734985798437'
-
-# List of callables that know how to import templates from various sources.
-TEMPLATE_LOADERS = (
-    'django.template.loaders.filesystem.load_template_source',
-    'django.template.loaders.app_directories.load_template_source',
-#     'django.template.loaders.eggs.load_template_source',
-)
-
-# django-openid-auth will *not* work with Django 1.1.1 or older, as it's
-# missing the csrf_token template tag.  This will allow it to work with
-# Django 1.1.2 or later:
-try: 
-    import django.middleware.csrf
-except ImportError:
-    csrf_middleware = 'django.contrib.csrf.middleware.CsrfViewMiddleware'
-else:
-    csrf_middleware = 'django.middleware.csrf.CsrfViewMiddleware'
-
-MIDDLEWARE_CLASSES = (
-    'django.middleware.common.CommonMiddleware',
-    'django.contrib.sessions.middleware.SessionMiddleware',
-    'django.contrib.auth.middleware.AuthenticationMiddleware',
-    csrf_middleware,
-)
-
-ROOT_URLCONF = 'example_consumer.urls'
-
-TEMPLATE_DIRS = (
-    # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
-    # Always use forward slashes, even on Windows.
-    # Don't forget to use absolute paths, not relative paths.
-)
-
-INSTALLED_APPS = (
-    'django.contrib.auth',
-    'django.contrib.contenttypes',
-    'django.contrib.sessions',
-    'django.contrib.admin',
-    'django_openid_auth',
-)
-
-AUTHENTICATION_BACKENDS = (
-    'django_openid_auth.auth.OpenIDBackend',
-    'django.contrib.auth.backends.ModelBackend',
-)
-
-# Should users be created when new OpenIDs are used to log in?
-OPENID_CREATE_USERS = True
-
-# When logging in again, should we overwrite user details based on
-# data received via Simple Registration?
-OPENID_UPDATE_DETAILS_FROM_SREG = True
-
-# If set, always use this as the identity URL rather than asking the
-# user.  This only makes sense if it is a server URL.
-OPENID_SSO_SERVER_URL = 'https://login.launchpad.net/'
-
-# Tell django.contrib.auth to use the OpenID signin URLs.
-LOGIN_URL = '/openid/login/'
-LOGIN_REDIRECT_URL = '/'
-
-# Should django_auth_openid be used to sign into the admin interface?
-OPENID_USE_AS_ADMIN_LOGIN = False

=== added file 'PKG-INFO'
--- PKG-INFO	1970-01-01 00:00:00 +0000
+++ PKG-INFO	2013-03-26 11:57:40 +0000
@@ -0,0 +1,31 @@
+Metadata-Version: 1.1
+Name: django-openid-auth
+Version: 0.5
+Summary: OpenID integration for django.contrib.auth
+Home-page: https://launchpad.net/django-openid-auth
+Author: Canonical Ltd
+Author-email: UNKNOWN
+License: BSD
+Download-URL: http://launchpad.net/django-openid-auth/trunk/0.5/+download/django-openid-auth-0.5.tar.gz
+Description: A library that can be used to add OpenID support to Django applications.
+        The library integrates with Django's built in authentication system, so
+        most applications require minimal changes to support OpenID llogin. The
+        library also includes the following features:
+          * Basic user details are transferred from the OpenID server via the
+            Simple Registration extension or Attribute Exchange extension.
+          * can be configured to use a fixed OpenID server URL, for use in SSO.
+          * supports the launchpad.net teams extension to get team membership
+            info.
+        
+Platform: any
+Classifier: Development Status :: 4 - Beta
+Classifier: Environment :: Web Environment
+Classifier: Framework :: Django
+Classifier: Intended Audience :: Developers
+Classifier: License :: OSI Approved :: BSD License
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Topic :: Software Development :: Libraries :: Python Modules
+Requires: django (>=1.1.2)
+Requires: openid (>=2.2.0)
+Provides: django_openid_auth

=== modified file 'README.txt'
--- README.txt	2012-06-27 08:25:19 +0000
+++ README.txt	2013-03-26 11:57:40 +0000
@@ -166,3 +166,14 @@
 
 This function must return a Django.http.HttpResponse instance.
 
+== Use the user's email for suggested usernames ==
+
+You can optionally strip out non-alphanumeric characters from the user's email
+to generate a preferred username, if the server doesn't provide nick
+information, by setting the following setting:
+
+        OPENID_USE_EMAIL_FOR_USERNAME = True
+
+Otherwise, and by default, if the server omits nick information and a user is
+created it'll receive a username 'openiduser' + a number.
+Consider also the OPENID_STRICT_USERNAMES setting (see ``Require a valid nickname``)

=== modified file 'debian/changelog'
--- debian/changelog	2012-07-02 12:31:05 +0000
+++ debian/changelog	2013-03-26 11:57:40 +0000
@@ -1,3 +1,12 @@
+django-openid-auth (0.5-0ubuntu1) raring; urgency=low
+
+  * New upstream release.
+  * Bump Standards-Version to 3.9.4
+  * Dropped openid.txt from the package
+  * Removed fix_settings_database.patch as the fix was incorporated upstream
+
+ -- Chris Johnston <[e-mail]>  Mon, 25 Mar 2013 15:16:38 -0400
+
 django-openid-auth (0.4-1ubuntu1) quantal; urgency=low
 
   * Replaces python-django-openid-auth to to remove the Ubuntu-only 

=== modified file 'debian/control'
--- debian/control	2012-07-02 12:31:05 +0000
+++ debian/control	2013-03-26 11:57:40 +0000
@@ -9,7 +9,7 @@
                python-django (>= 1.2),
                python-openid,
                python-support
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
 XS-Python-Version: >= 2.6
 Homepage: https://launchpad.net/django-openid-auth
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/django-openid-auth/trunk/

=== modified file 'debian/docs'
--- debian/docs	2012-06-27 08:25:19 +0000
+++ debian/docs	2013-03-26 11:57:40 +0000
@@ -1,3 +1,2 @@
 README.txt
 TODO.txt
-openid.txt

=== removed directory 'debian/patches'
=== removed file 'debian/patches/fix_settings_database.patch'
--- debian/patches/fix_settings_database.patch	2012-06-27 08:25:19 +0000
+++ debian/patches/fix_settings_database.patch	1970-01-01 00:00:00 +0000
@@ -1,42 +0,0 @@
-Description: Use Django 1.3 DATABASE structure
- Upstream still ships the old database configuration for Django in its 
- example consumer. This patch changes it to the new dictionary structure.
-Author: Michael Fladischer <[e-mail]>
-Last-Update: 2012-04-20
-Forwarded: no
-
---- a/example_consumer/settings.py
-+++ b/example_consumer/settings.py
-@@ -38,12 +38,13 @@
- 
- MANAGERS = ADMINS
- 
--DATABASE_ENGINE = 'sqlite3'           # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'ado_mssql'.
--DATABASE_NAME = 'sqlite.db'             # Or path to database file if using sqlite3.
--DATABASE_USER = ''             # Not used with sqlite3.
--DATABASE_PASSWORD = ''         # Not used with sqlite3.
--DATABASE_HOST = ''             # Set to empty string for localhost. Not used with sqlite3.
--DATABASE_PORT = ''             # Set to empty string for default. Not used with sqlite3.
-+DATABASES = {
-+    'default': {
-+        'ENGINE': 'django.db.backends.sqlite3',
-+        'NAME': 'example_consumer/test.db3',
-+    }
-+}
-+
- 
- # Local time zone for this installation. Choices can be found here:
- # http://www.postgresql.org/docs/8.1/static/datetime-keywords.html#DATETIME-TIMEZONE-SET-TABLE
-@@ -81,9 +82,9 @@
- 
- # List of callables that know how to import templates from various sources.
- TEMPLATE_LOADERS = (
--    'django.template.loaders.filesystem.load_template_source',
--    'django.template.loaders.app_directories.load_template_source',
--#     'django.template.loaders.eggs.load_template_source',
-+    'django.template.loaders.filesystem.Loader',
-+    'django.template.loaders.app_directories.Loader',
-+#    'django.template.loaders.eggs.Loader',
- )
- 
- # django-openid-auth will *not* work with Django 1.1.1 or older, as it's

=== removed file 'debian/patches/series'
--- debian/patches/series	2012-06-27 08:25:19 +0000
+++ debian/patches/series	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-fix_settings_database.patch

=== modified file 'django_openid_auth/__init__.py'
--- django_openid_auth/__init__.py	2010-12-03 00:46:25 +0000
+++ django_openid_auth/__init__.py	2013-03-26 11:57:40 +0000
@@ -1,7 +1,7 @@
 # django-openid-auth -  OpenID integration for django.contrib.auth
 #
 # Copyright (C) 2007 Simon Willison
-# Copyright (C) 2008-2010 Canonical Ltd.
+# Copyright (C) 2008-2013 Canonical Ltd.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions

=== removed file 'django_openid_auth/__init__.pyc'
Binary files django_openid_auth/__init__.pyc	2012-06-27 08:25:19 +0000 and django_openid_auth/__init__.pyc	1970-01-01 00:00:00 +0000 differ
=== modified file 'django_openid_auth/admin.py'
--- django_openid_auth/admin.py	2010-12-03 00:46:25 +0000
+++ django_openid_auth/admin.py	2013-03-26 11:57:40 +0000
@@ -1,6 +1,6 @@
 # django-openid-auth -  OpenID integration for django.contrib.auth
 #
-# Copyright (C) 2008-2010 Canonical Ltd.
+# Copyright (C) 2008-2013 Canonical Ltd.
 # Copyright (C) 2010 Dave Walker
 #
 # Redistribution and use in source and binary forms, with or without
@@ -62,6 +62,7 @@
 
 
 class UserOpenIDAdmin(admin.ModelAdmin):
+    raw_id_fields = ('user',)
     list_display = ('user', 'claimed_id')
     search_fields = ('claimed_id',)
 
@@ -76,15 +77,14 @@
     def _openid_login(self, request, error_message='', extra_context=None):
         if request.user.is_authenticated():
             if not request.user.is_staff:
-                return views.render_failure(
+                return views.default_render_failure(
                     request, "User %s does not have admin access."
                     % request.user.username)
-            return views.render_failure(
-                request, "Unknown Error: %s" % error_message)
+            assert error_message, "Unknown Error: %s" % error_message
         else:
             # Redirect to openid login path,
             return HttpResponseRedirect(
                 settings.LOGIN_URL + "?next=" + request.get_full_path())
 
     # Overide the standard admin login form.
-    admin.sites.AdminSite.display_login_form = _openid_login
+    admin.sites.AdminSite.login = _openid_login

=== modified file 'django_openid_auth/auth.py'
--- django_openid_auth/auth.py	2012-06-27 08:25:19 +0000
+++ django_openid_auth/auth.py	2013-03-26 11:57:40 +0000
@@ -1,6 +1,6 @@
 # django-openid-auth -  OpenID integration for django.contrib.auth
 #
-# Copyright (C) 2008-2010 Canonical Ltd.
+# Copyright (C) 2008-2013 Canonical Ltd.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -49,6 +49,9 @@
     """A django.contrib.auth backend that authenticates the user based on
     an OpenID response."""
 
+    supports_object_permissions = False
+    supports_anonymous_user = True
+
     def get_user(self, user_id):
         try:
             return User.objects.get(pk=user_id)
@@ -146,6 +149,16 @@
         return dict(email=email, nickname=nickname,
                     first_name=first_name, last_name=last_name)
 
+    def _get_preferred_username(self, nickname, email):
+        if nickname:
+            return nickname
+        if email and getattr(settings, 'OPENID_USE_EMAIL_FOR_USERNAME',
+            False):
+            suggestion = ''.join([x for x in email if x.isalnum()])
+            if suggestion:
+                return suggestion
+        return 'openiduser'
+
     def _get_available_username(self, nickname, identity_url):
         # If we're being strict about usernames, throw an error if we didn't
         # get one back from the provider
@@ -198,8 +211,10 @@
                     "already in use for a different account." % nickname)
 
         # Pick a username for the user based on their nickname,
-        # checking for conflicts.
-        i = 1
+        # checking for conflicts.  Start with number of existing users who's
+        # username starts with this nickname to avoid having to iterate over
+        # all of the existing ones.
+        i = User.objects.filter(username__startswith=nickname).count() + 1
         while True:
             username = nickname
             if i > 1:
@@ -223,10 +238,12 @@
                     "An attribute required for logging in was not "
                     "returned ({0}).".format(required_attr))
 
-        nickname = details['nickname'] or 'openiduser'
+        nickname = self._get_preferred_username(details['nickname'],
+            details['email'])
         email = details['email'] or ''
 
-        username = self._get_available_username(details['nickname'], openid_response.identity_url)
+        username = self._get_available_username(nickname,
+            openid_response.identity_url)
 
         user = User.objects.create_user(username, email, password=None)
         self.associate_openid(user, openid_response)

=== removed file 'django_openid_auth/auth.py.~1~'
--- django_openid_auth/auth.py.~1~	2012-06-27 08:25:19 +0000
+++ django_openid_auth/auth.py.~1~	1970-01-01 00:00:00 +0000
@@ -1,313 +0,0 @@
-# django-openid-auth -  OpenID integration for django.contrib.auth
-#
-# Copyright (C) 2008-2010 Canonical Ltd.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# * Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# 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.
-
-"""Glue between OpenID and django.contrib.auth."""
-
-__metaclass__ = type
-
-from django.conf import settings
-from django.contrib.auth.models import User, Group
-from openid.consumer.consumer import SUCCESS
-from openid.extensions import ax, sreg, pape
-
-from django_openid_auth import teams
-from django_openid_auth.models import UserOpenID
-from django_openid_auth.exceptions import (
-    IdentityAlreadyClaimed,
-    DuplicateUsernameViolation,
-    MissingUsernameViolation,
-    MissingPhysicalMultiFactor,
-    RequiredAttributeNotReturned,
-)
-
-class OpenIDBackend:
-    """A django.contrib.auth backend that authenticates the user based on
-    an OpenID response."""
-
-    def get_user(self, user_id):
-        try:
-            return User.objects.get(pk=user_id)
-        except User.DoesNotExist:
-            return None
-
-    def authenticate(self, **kwargs):
-        """Authenticate the user based on an OpenID response."""
-        # Require that the OpenID response be passed in as a keyword
-        # argument, to make sure we don't match the username/password
-        # calling conventions of authenticate.
-
-        openid_response = kwargs.get('openid_response')
-        if openid_response is None:
-            return None
-
-        if openid_response.status != SUCCESS:
-            return None
-
-        user = None
-        try:
-            user_openid = UserOpenID.objects.get(
-                claimed_id__exact=openid_response.identity_url)
-        except UserOpenID.DoesNotExist:
-            if getattr(settings, 'OPENID_CREATE_USERS', False):
-                user = self.create_user_from_openid(openid_response)
-        else:
-            user = user_openid.user
-
-        if user is None:
-            return None
-
-        if getattr(settings, 'OPENID_UPDATE_DETAILS_FROM_SREG', False):
-            details = self._extract_user_details(openid_response)
-            self.update_user_details(user, details, openid_response)
-
-        if getattr(settings, 'OPENID_PHYSICAL_MULTIFACTOR_REQUIRED', False):
-            pape_response = pape.Response.fromSuccessResponse(openid_response)
-            if pape_response is None or \
-               pape.AUTH_MULTI_FACTOR_PHYSICAL not in pape_response.auth_policies:
-                raise MissingPhysicalMultiFactor()
-
-        teams_response = teams.TeamsResponse.fromSuccessResponse(
-            openid_response)
-        if teams_response:
-            self.update_groups_from_teams(user, teams_response)
-            self.update_staff_status_from_teams(user, teams_response)
-
-        return user
-
-    def _extract_user_details(self, openid_response):
-        email = fullname = first_name = last_name = nickname = None
-        sreg_response = sreg.SRegResponse.fromSuccessResponse(openid_response)
-        if sreg_response:
-            email = sreg_response.get('email')
-            fullname = sreg_response.get('fullname')
-            nickname = sreg_response.get('nickname')
-        # If any attributes are provided via Attribute Exchange, use
-        # them in preference.
-        fetch_response = ax.FetchResponse.fromSuccessResponse(openid_response)
-        if fetch_response:
-            # The myOpenID provider advertises AX support, but uses
-            # attribute names from an obsolete draft of the
-            # specification.  We check for them first so the common
-            # names take precedence.
-            email = fetch_response.getSingle(
-                'http://schema.openid.net/contact/email', email)
-            fullname = fetch_response.getSingle(
-                'http://schema.openid.net/namePerson', fullname)
-            nickname = fetch_response.getSingle(
-                'http://schema.openid.net/namePerson/friendly', nickname)
-
-            email = fetch_response.getSingle(
-                'http://axschema.org/contact/email', email)
-            fullname = fetch_response.getSingle(
-                'http://axschema.org/namePerson', fullname)
-            first_name = fetch_response.getSingle(
-                'http://axschema.org/namePerson/first', first_name)
-            last_name = fetch_response.getSingle(
-                'http://axschema.org/namePerson/last', last_name)
-            nickname = fetch_response.getSingle(
-                'http://axschema.org/namePerson/friendly', nickname)
-
-        if fullname and not (first_name or last_name):
-            # Django wants to store first and last names separately,
-            # so we do our best to split the full name.
-            fullname = fullname.strip()
-            split_names = fullname.rsplit(None, 1)
-            if len(split_names) == 2:
-                first_name, last_name = split_names
-            else:
-                first_name = u''
-                last_name = fullname
-
-        return dict(email=email, nickname=nickname,
-                    first_name=first_name, last_name=last_name)
-
-    def _get_available_username(self, nickname, identity_url):
-        # If we're being strict about usernames, throw an error if we didn't
-        # get one back from the provider
-        if getattr(settings, 'OPENID_STRICT_USERNAMES', False):
-            if nickname is None or nickname == '':
-                raise MissingUsernameViolation()
-                
-        # If we don't have a nickname, and we're not being strict, use a default
-        nickname = nickname or 'openiduser'
-
-        # See if we already have this nickname assigned to a username
-        try:
-            user = User.objects.get(username__exact=nickname)
-        except User.DoesNotExist:
-            # No conflict, we can use this nickname
-            return nickname
-
-        # Check if we already have nickname+i for this identity_url
-        try:
-            user_openid = UserOpenID.objects.get(
-                claimed_id__exact=identity_url,
-                user__username__startswith=nickname)
-            # No exception means we have an existing user for this identity
-            # that starts with this nickname.
-            
-            # If they are an exact match, the user already exists and hasn't
-            # changed their username, so continue to use it
-            if nickname == user_openid.user.username:
-                return nickname
-            
-            # It is possible we've had to assign them to nickname+i already.
-            oid_username = user_openid.user.username
-            if len(oid_username) > len(nickname):
-                try:
-                    # check that it ends with a number
-                    int(oid_username[len(nickname):])
-                    return oid_username
-                except ValueError:
-                    # username starts with nickname, but isn't nickname+#
-                    pass
-        except UserOpenID.DoesNotExist:
-            # No user associated with this identity_url
-            pass
-
-
-        if getattr(settings, 'OPENID_STRICT_USERNAMES', False):
-            if User.objects.filter(username__exact=nickname).count() > 0:
-                raise DuplicateUsernameViolation(
-                    "The username (%s) with which you tried to log in is "
-                    "already in use for a different account." % nickname)
-
-        # Pick a username for the user based on their nickname,
-        # checking for conflicts.
-        i = 1
-        while True:
-            username = nickname
-            if i > 1:
-                username += str(i)
-            try:
-                user = User.objects.get(username__exact=username)
-            except User.DoesNotExist:
-                break
-            i += 1
-        return username
-
-    def create_user_from_openid(self, openid_response):
-        details = self._extract_user_details(openid_response)
-        required_attrs = getattr(settings, 'OPENID_SREG_REQUIRED_FIELDS', [])
-        if getattr(settings, 'OPENID_STRICT_USERNAMES', False):
-            required_attrs.append('nickname')
-
-        for required_attr in required_attrs:
-            if required_attr not in details or not details[required_attr]:
-                raise RequiredAttributeNotReturned(
-                    "An attribute required for logging in was not "
-                    "returned ({0}).".format(required_attr))
-
-        nickname = details['nickname'] or 'openiduser'
-        email = details['email'] or ''
-
-        username = self._get_available_username(details['nickname'], openid_response.identity_url)
-
-        user = User.objects.create_user(username, email, password=None)
-        self.associate_openid(user, openid_response)
-        self.update_user_details(user, details, openid_response)
-
-        return user
-
-    def associate_openid(self, user, openid_response):
-        """Associate an OpenID with a user account."""
-        # Check to see if this OpenID has already been claimed.
-        try:
-            user_openid = UserOpenID.objects.get(
-                claimed_id__exact=openid_response.identity_url)
-        except UserOpenID.DoesNotExist:
-            user_openid = UserOpenID(
-                user=user,
-                claimed_id=openid_response.identity_url,
-                display_id=openid_response.endpoint.getDisplayIdentifier())
-            user_openid.save()
-        else:
-            if user_openid.user != user:
-                raise IdentityAlreadyClaimed(
-                    "The identity %s has already been claimed"
-                    % openid_response.identity_url)
-
-        return user_openid
-
-    def update_user_details(self, user, details, openid_response):
-        updated = False
-        if details['first_name']:
-            user.first_name = details['first_name'][:30]
-            updated = True
-        if details['last_name']:
-            user.last_name = details['last_name'][:30]
-            updated = True
-        if details['email']:
-            user.email = details['email']
-            updated = True
-        if getattr(settings, 'OPENID_FOLLOW_RENAMES', False):
-            user.username = self._get_available_username(details['nickname'], openid_response.identity_url)
-            updated = True
-
-        if updated:
-            user.save()
-
-    def update_groups_from_teams(self, user, teams_response):
-        teams_mapping_auto = getattr(settings, 'OPENID_LAUNCHPAD_TEAMS_MAPPING_AUTO', False)
-        teams_mapping_auto_blacklist = getattr(settings, 'OPENID_LAUNCHPAD_TEAMS_MAPPING_AUTO_BLACKLIST', [])
-        teams_mapping = getattr(settings, 'OPENID_LAUNCHPAD_TEAMS_MAPPING', {})
-        if teams_mapping_auto:
-            #ignore teams_mapping. use all django-groups
-            teams_mapping = dict()
-            all_groups = Group.objects.exclude(name__in=teams_mapping_auto_blacklist)
-            for group in all_groups:
-                teams_mapping[group.name] = group.name
-
-        if len(teams_mapping) == 0:
-            return
-
-        current_groups = set(user.groups.filter(
-                name__in=teams_mapping.values()))
-        desired_groups = set(Group.objects.filter(
-                name__in=[teams_mapping[lp_team]
-                          for lp_team in teams_response.is_member
-                          if lp_team in teams_mapping]))
-        for group in current_groups - desired_groups:
-            user.groups.remove(group)
-        for group in desired_groups - current_groups:
-            user.groups.add(group)
-
-    def update_staff_status_from_teams(self, user, teams_response):
-        if not hasattr(settings, 'OPENID_LAUNCHPAD_STAFF_TEAMS'):
-            return
-
-        staff_teams = getattr(settings, 'OPENID_LAUNCHPAD_STAFF_TEAMS', [])
-        user.is_staff = False
-
-        for lp_team in teams_response.is_member:
-            if lp_team in staff_teams:
-                user.is_staff = True
-                break
-
-        user.save()
-

=== removed file 'django_openid_auth/auth.pyc'
Binary files django_openid_auth/auth.pyc	2012-06-27 08:25:19 +0000 and django_openid_auth/auth.pyc	1970-01-01 00:00:00 +0000 differ
=== modified file 'django_openid_auth/exceptions.py'
--- django_openid_auth/exceptions.py	2012-06-27 08:25:19 +0000
+++ django_openid_auth/exceptions.py	2013-03-26 11:57:40 +0000
@@ -1,6 +1,6 @@
 # django-openid-auth -  OpenID integration for django.contrib.auth
 #
-# Copyright (C) 2008-2010 Canonical Ltd.
+# Copyright (C) 2008-2013 Canonical Ltd.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions

=== removed file 'django_openid_auth/exceptions.pyc'
Binary files django_openid_auth/exceptions.pyc	2012-06-27 08:25:19 +0000 and django_openid_auth/exceptions.pyc	1970-01-01 00:00:00 +0000 differ
=== modified file 'django_openid_auth/forms.py'
--- django_openid_auth/forms.py	2010-12-03 00:46:25 +0000
+++ django_openid_auth/forms.py	2013-03-26 11:57:40 +0000
@@ -1,7 +1,7 @@
 # django-openid-auth -  OpenID integration for django.contrib.auth
 #
 # Copyright (C) 2007 Simon Willison
-# Copyright (C) 2008-2010 Canonical Ltd.
+# Copyright (C) 2008-2013 Canonical Ltd.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions

=== removed file 'django_openid_auth/forms.pyc'
Binary files django_openid_auth/forms.pyc	2012-06-27 08:25:19 +0000 and django_openid_auth/forms.pyc	1970-01-01 00:00:00 +0000 differ
=== modified file 'django_openid_auth/management/__init__.py'
--- django_openid_auth/management/__init__.py	2010-12-03 00:46:25 +0000
+++ django_openid_auth/management/__init__.py	2013-03-26 11:57:40 +0000
@@ -1,6 +1,6 @@
 # django-openid-auth -  OpenID integration for django.contrib.auth
 #
-# Copyright (C) 2009-2010 Canonical Ltd.
+# Copyright (C) 2009-2013 Canonical Ltd.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions

=== removed file 'django_openid_auth/management/__init__.pyc'
Binary files django_openid_auth/management/__init__.pyc	2012-06-27 08:25:19 +0000 and django_openid_auth/management/__init__.pyc	1970-01-01 00:00:00 +0000 differ
=== modified file 'django_openid_auth/management/commands/__init__.py'
--- django_openid_auth/management/commands/__init__.py	2010-12-03 00:46:25 +0000
+++ django_openid_auth/management/commands/__init__.py	2013-03-26 11:57:40 +0000
@@ -1,6 +1,6 @@
 # django-openid-auth -  OpenID integration for django.contrib.auth
 #
-# Copyright (C) 2009-2010 Canonical Ltd.
+# Copyright (C) 2009-2013 Canonical Ltd.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions

=== modified file 'django_openid_auth/management/commands/openid_cleanup.py'
--- django_openid_auth/management/commands/openid_cleanup.py	2010-12-03 00:46:25 +0000
+++ django_openid_auth/management/commands/openid_cleanup.py	2013-03-26 11:57:40 +0000
@@ -1,6 +1,6 @@
 # django-openid-auth -  OpenID integration for django.contrib.auth
 #
-# Copyright (C) 2009-2010 Canonical Ltd.
+# Copyright (C) 2009-2013 Canonical Ltd.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions

=== modified file 'django_openid_auth/models.py'
--- django_openid_auth/models.py	2010-12-03 00:46:25 +0000
+++ django_openid_auth/models.py	2013-03-26 11:57:40 +0000
@@ -1,7 +1,7 @@
 # django-openid-auth -  OpenID integration for django.contrib.auth
 #
 # Copyright (C) 2007 Simon Willison
-# Copyright (C) 2008-2010 Canonical Ltd.
+# Copyright (C) 2008-2013 Canonical Ltd.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions

=== removed file 'django_openid_auth/models.pyc'
Binary files django_openid_auth/models.pyc	2012-06-27 08:25:19 +0000 and django_openid_auth/models.pyc	1970-01-01 00:00:00 +0000 differ
=== modified file 'django_openid_auth/signals.py'
--- django_openid_auth/signals.py	2012-06-27 08:25:19 +0000
+++ django_openid_auth/signals.py	2013-03-26 11:57:40 +0000
@@ -1,7 +1,7 @@
 # django-openid-auth -  OpenID integration for django.contrib.auth
 #
 # Copyright (C) 2007 Simon Willison
-# Copyright (C) 2008-2010 Canonical Ltd.
+# Copyright (C) 2008-2013 Canonical Ltd.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions

=== removed file 'django_openid_auth/signals.pyc'
Binary files django_openid_auth/signals.pyc	2012-06-27 08:25:19 +0000 and django_openid_auth/signals.pyc	1970-01-01 00:00:00 +0000 differ
=== modified file 'django_openid_auth/store.py'
--- django_openid_auth/store.py	2010-12-03 00:46:25 +0000
+++ django_openid_auth/store.py	2013-03-26 11:57:40 +0000
@@ -1,7 +1,7 @@
 # django-openid-auth -  OpenID integration for django.contrib.auth
 #
 # Copyright (C) 2007 Simon Willison
-# Copyright (C) 2008-2010 Canonical Ltd.
+# Copyright (C) 2008-2013 Canonical Ltd.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions

=== removed file 'django_openid_auth/store.pyc'
Binary files django_openid_auth/store.pyc	2012-06-27 08:25:19 +0000 and django_openid_auth/store.pyc	1970-01-01 00:00:00 +0000 differ
=== modified file 'django_openid_auth/teams.py'
--- django_openid_auth/teams.py	2010-12-03 00:46:25 +0000
+++ django_openid_auth/teams.py	2013-03-26 11:57:40 +0000
@@ -1,6 +1,6 @@
 # Launchpad OpenID Teams Extension support for python-openid
 #
-# Copyright (C) 2008-2010 Canonical Ltd.
+# Copyright (C) 2008-2013 Canonical Ltd.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions

=== removed file 'django_openid_auth/teams.pyc'
Binary files django_openid_auth/teams.pyc	2012-06-27 08:25:19 +0000 and django_openid_auth/teams.pyc	1970-01-01 00:00:00 +0000 differ
=== modified file 'django_openid_auth/tests/__init__.py'
--- django_openid_auth/tests/__init__.py	2012-06-27 08:25:19 +0000
+++ django_openid_auth/tests/__init__.py	2013-03-26 11:57:40 +0000
@@ -1,6 +1,6 @@
 # django-openid-auth -  OpenID integration for django.contrib.auth
 #
-# Copyright (C) 2009-2010 Canonical Ltd.
+# Copyright (C) 2009-2013 Canonical Ltd.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -30,11 +30,12 @@
 from test_views import *
 from test_store import *
 from test_auth import *
+from test_admin import *
 
 
 def suite():
     suite = unittest.TestSuite()
-    for name in ['test_auth', 'test_store', 'test_views']:
+    for name in ['test_auth', 'test_store', 'test_views', 'test_admin']:
         mod = __import__('%s.%s' % (__name__, name), {}, {}, ['suite'])
         suite.addTest(mod.suite())
     return suite

=== removed file 'django_openid_auth/tests/__init__.pyc'
Binary files django_openid_auth/tests/__init__.pyc	2012-06-27 08:25:19 +0000 and django_openid_auth/tests/__init__.pyc	1970-01-01 00:00:00 +0000 differ
=== added file 'django_openid_auth/tests/test_admin.py'
--- django_openid_auth/tests/test_admin.py	1970-01-01 00:00:00 +0000
+++ django_openid_auth/tests/test_admin.py	2013-03-26 11:57:40 +0000
@@ -0,0 +1,88 @@
+# django-openid-auth -  OpenID integration for django.contrib.auth
+#
+# Copyright (C) 2009-2013 Canonical Ltd.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# * Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# 'AS IS' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# 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.
+"""
+Tests for the django_openid_auth Admin login form replacement.
+"""
+
+import os
+import unittest
+
+from django.conf import settings
+from django.contrib.auth.models import User, AnonymousUser
+
+settings.OPENID_USE_AS_ADMIN_LOGIN = True
+from django_openid_auth import admin
+
+from django.test import TestCase
+
+
+def create_user(is_staff=False, authenticated=True):
+    """
+    Create and return a user, either the AnonymousUser or a normal Django user,
+    setting the is_staff attribute if appropriate.
+    """
+    if not authenticated:
+        return AnonymousUser()
+    else:
+        user = User(
+            username=u'testing', email='[e-mail]',
+            is_staff=is_staff)
+        user.set_password(u'test')
+        user.save()
+
+
+class SiteAdminTests(TestCase):
+    """
+    TestCase for accessing /admin/ when the django_openid_auth form replacement
+    is in use.
+    """
+
+    def test_admin_site_with_openid_login_authenticated_non_staff(self):
+        """
+        If the request has an authenticated user, who is not flagged as a
+        staff member, then they get a failure response.
+        """
+        create_user()
+        self.client.login(username='testing', password='test')
+        response = self.client.get('/admin/')
+        self.assertTrue('User testing does not have admin access.' in
+                        response.content, 'Missing error message in response')
+
+    def test_admin_site_with_openid_login_non_authenticated_user(self):
+        """
+        Unauthenticated users accessing the admin page should be directed to
+        the OpenID login url.
+        """
+        response = self.client.get('/admin/')
+        self.assertEqual(302, response.status_code)
+        self.assertEqual('http://testserver/openid/login/?next=/admin/',
+                         response['Location'])
+
+
+def suite():
+    return unittest.TestLoader().loadTestsFromName(__name__)

=== modified file 'django_openid_auth/tests/test_auth.py'
--- django_openid_auth/tests/test_auth.py	2012-06-27 08:25:19 +0000
+++ django_openid_auth/tests/test_auth.py	2013-03-26 11:57:40 +0000
@@ -1,6 +1,6 @@
 # django-openid-auth -  OpenID integration for django.contrib.auth
 #
-# Copyright (C) 2010 Canonical Ltd.
+# Copyright (C) 2010-2013 Canonical Ltd.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -28,6 +28,7 @@
 
 import unittest
 
+from django.conf import settings
 from django.contrib.auth.models import User
 from django.test import TestCase
 
@@ -45,6 +46,12 @@
     def setUp(self):
         super(OpenIDBackendTests, self).setUp()
         self.backend = OpenIDBackend()
+        self.old_openid_use_email_for_username = getattr(settings,
+            'OPENID_USE_EMAIL_FOR_USERNAME', False)
+
+    def tearDown(self):
+        settings.OPENID_USE_EMAIL_FOR_USERNAME = \
+            self.old_openid_use_email_for_username
 
     def test_extract_user_details_sreg(self):
         endpoint = OpenIDServiceEndpoint()
@@ -150,6 +157,29 @@
         self.assertEqual("Some", data['first_name'])
         self.assertEqual("User", data['last_name'])
 
+    def test_preferred_username_email_munging(self):
+        settings.OPENID_USE_EMAIL_FOR_USERNAME = True
+        for nick, email, expected in [
+            ('nickcomesfirst', '[e-mail]', 'nickcomesfirst'),
+            ('', '[e-mail]', 'fooexamplecom'),
+            ('noemail', '', 'noemail'),
+            ('', '@%.-', 'openiduser'),
+            ('', '', 'openiduser'),
+            (None, None, 'openiduser')]:
+            self.assertEqual(expected,
+                self.backend._get_preferred_username(nick, email))
+
+    def test_preferred_username_no_email_munging(self):
+        for nick, email, expected in [
+            ('nickcomesfirst', '[e-mail]', 'nickcomesfirst'),
+            ('', '[e-mail]', 'openiduser'),
+            ('noemail', '', 'noemail'),
+            ('', '@%.-', 'openiduser'),
+            ('', '', 'openiduser'),
+            (None, None, 'openiduser')]:
+            self.assertEqual(expected,
+                self.backend._get_preferred_username(nick, email))
+
 
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)

=== removed file 'django_openid_auth/tests/test_auth.pyc'
Binary files django_openid_auth/tests/test_auth.pyc	2012-06-27 08:25:19 +0000 and django_openid_auth/tests/test_auth.pyc	1970-01-01 00:00:00 +0000 differ
=== modified file 'django_openid_auth/tests/test_store.py'
--- django_openid_auth/tests/test_store.py	2010-12-03 00:46:25 +0000
+++ django_openid_auth/tests/test_store.py	2013-03-26 11:57:40 +0000
@@ -1,6 +1,6 @@
 # django-openid-auth -  OpenID integration for django.contrib.auth
 #
-# Copyright (C) 2009-2010 Canonical Ltd.
+# Copyright (C) 2009-2013 Canonical Ltd.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions

=== removed file 'django_openid_auth/tests/test_store.pyc'
Binary files django_openid_auth/tests/test_store.pyc	2012-06-27 08:25:19 +0000 and django_openid_auth/tests/test_store.pyc	1970-01-01 00:00:00 +0000 differ
=== modified file 'django_openid_auth/tests/test_views.py'
--- django_openid_auth/tests/test_views.py	2012-06-27 08:25:19 +0000
+++ django_openid_auth/tests/test_views.py	2013-03-26 11:57:40 +0000
@@ -1,6 +1,7 @@
+# -*- coding: utf-8 -*-
 # django-openid-auth -  OpenID integration for django.contrib.auth
 #
-# Copyright (C) 2009-2010 Canonical Ltd.
+# Copyright (C) 2009-2013 Canonical Ltd.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -42,7 +43,7 @@
 from openid.oidutil import importElementTree
 from openid.server.server import BROWSER_REQUEST_MODES, ENCODE_URL, Server
 from openid.store.memstore import MemoryStore
-from openid.message import OPENID1_URL_LIMIT, IDENTIFIER_SELECT
+from openid.message import IDENTIFIER_SELECT
 
 from django_openid_auth import teams
 from django_openid_auth.models import UserOpenID
@@ -50,7 +51,6 @@
     sanitise_redirect_url, 
     make_consumer,
 )
-from django_openid_auth.auth import OpenIDBackend
 from django_openid_auth.signals import openid_login_complete
 from django_openid_auth.store import DjangoOpenIDStore
 from django_openid_auth.exceptions import (
@@ -169,9 +169,10 @@
         self.req = DummyDjangoRequest('http://localhost/')
         self.endpoint = OpenIDServiceEndpoint()
         self.endpoint.claimed_id = 'http://example.com/identity'
-        self.endpoint.server_url = 'http://example.com/'
+        server_url = 'http://example.com/'
+        self.endpoint.server_url = server_url
         self.consumer = make_consumer(self.req)
-        self.server = Server(DjangoOpenIDStore())
+        self.server = Server(DjangoOpenIDStore(), op_endpoint=server_url)
         setDefaultFetcher(self.provider, wrap_exceptions=False)
 
         self.old_login_redirect_url = getattr(settings, 'LOGIN_REDIRECT_URL', '/accounts/profile/')
@@ -185,6 +186,8 @@
         self.old_physical_multifactor = getattr(settings, 'OPENID_PHYSICAL_MULTIFACTOR_REQUIRED', False)
         self.old_login_render_failure = getattr(settings, 'OPENID_RENDER_FAILURE', None)
         self.old_consumer_complete = Consumer.complete
+        self.old_openid_use_email_for_username = getattr(settings,
+            'OPENID_USE_EMAIL_FOR_USERNAME', False)
 
         self.old_required_fields = getattr(
             settings, 'OPENID_SREG_REQUIRED_FIELDS', [])
@@ -198,6 +201,7 @@
         settings.OPENID_FOLLOW_RENAMES = False
         settings.OPENID_PHYSICAL_MULTIFACTOR_REQUIRED = False
         settings.OPENID_SREG_REQUIRED_FIELDS = []
+        settings.OPENID_USE_EMAIL_FOR_USERNAME = False
 
     def tearDown(self):
         settings.LOGIN_REDIRECT_URL = self.old_login_redirect_url
@@ -212,6 +216,7 @@
         settings.OPENID_RENDER_FAILURE = self.old_login_render_failure
         Consumer.complete = self.old_consumer_complete
         settings.OPENID_SREG_REQUIRED_FIELDS = self.old_required_fields
+        settings.OPENID_USE_EMAIL_FOR_USERNAME = self.old_openid_use_email_for_username
 
         setDefaultFetcher(None)
         super(RelyingPartyTests, self).tearDown()
@@ -261,6 +266,13 @@
         response = self.client.get('/getuser/')
         self.assertEquals(response.content, 'someuser')
 
+    def test_login_with_nonascii_return_to(self):
+        """Ensure non-ascii characters can be used for the 'next' arg."""
+        response = self.client.post('/openid/login/',
+            {'openid_identifier': 'http://example.com/identity',
+             'next': u'/files/ñandú.jpg'.encode('utf-8')})
+        self.assertContains(response, 'OpenID transaction in progress')
+
     def test_login_no_next(self):
         """Logins with no next parameter redirect to LOGIN_REDIRECT_URL."""
         user = User.objects.create_user('someuser', '[e-mail]')
@@ -569,6 +581,112 @@
         self.assertEquals(user.last_name, 'User')
         self.assertEquals(user.email, '[e-mail]')
 
+    def test_login_without_nickname_with_email_suggestion(self):
+        settings.OPENID_CREATE_USERS = True
+        settings.OPENID_USE_EMAIL_FOR_USERNAME = True
+
+        openid_req = {'openid_identifier': 'http://example.com/identity',
+               'next': '/getuser/'}
+        openid_resp =  {'nickname': '', 'fullname': 'Openid User',
+                 'email': '[e-mail]'}
+        self._do_user_login(openid_req, openid_resp)
+        response = self.client.get('/getuser/')
+
+        # username defaults to a munged version of the email
+        self.assertEquals(response.content, 'fooexamplecom')
+
+    def test_login_duplicate_username_numbering(self):
+        settings.OPENID_FOLLOW_RENAMES = False
+        settings.OPENID_CREATE_USERS = True
+        settings.OPENID_UPDATE_DETAILS_FROM_SREG = True
+        # Setup existing user who's name we're going to conflict with
+        user = User.objects.create_user('testuser', '[e-mail]')
+
+        # identity url is for 'renameuser'
+        openid_req = {'openid_identifier': 'http://example.com/identity',
+               'next': '/getuser/'}
+        # but returned username is for 'testuser', which already exists for another identity
+        openid_resp =  {'nickname': 'testuser', 'fullname': 'Test User',
+                 'email': '[e-mail]'}
+        self._do_user_login(openid_req, openid_resp)
+        response = self.client.get('/getuser/')
+
+        # Since this username is already taken by someone else, we go through
+        # the process of adding +i to it, and get testuser2.
+        self.assertEquals(response.content, 'testuser2')
+
+    def test_login_duplicate_username_numbering_with_conflicts(self):
+        settings.OPENID_FOLLOW_RENAMES = False
+        settings.OPENID_CREATE_USERS = True
+        settings.OPENID_UPDATE_DETAILS_FROM_SREG = True
+        # Setup existing user who's name we're going to conflict with
+        user = User.objects.create_user('testuser', '[e-mail]')
+        user = User.objects.create_user('testuser3', '[e-mail]')
+
+        # identity url is for 'renameuser'
+        openid_req = {'openid_identifier': 'http://example.com/identity',
+               'next': '/getuser/'}
+        # but returned username is for 'testuser', which already exists for another identity
+        openid_resp =  {'nickname': 'testuser', 'fullname': 'Test User',
+                 'email': '[e-mail]'}
+        self._do_user_login(openid_req, openid_resp)
+        response = self.client.get('/getuser/')
+
+        # Since this username is already taken by someone else, we go through
+        # 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.assertEquals(response.content, 'testuser4')
+
+    def test_login_duplicate_username_numbering_with_holes(self):
+        settings.OPENID_FOLLOW_RENAMES = False
+        settings.OPENID_CREATE_USERS = True
+        settings.OPENID_UPDATE_DETAILS_FROM_SREG = True
+        # Setup existing user who's name we're going to conflict with
+        user = User.objects.create_user('testuser', '[e-mail]')
+        user = User.objects.create_user('testuser1', '[e-mail]')
+        user = User.objects.create_user('testuser6', '[e-mail]')
+        user = User.objects.create_user('testuser7', '[e-mail]')
+        user = User.objects.create_user('testuser8', '[e-mail]')
+
+        # identity url is for 'renameuser'
+        openid_req = {'openid_identifier': 'http://example.com/identity',
+               'next': '/getuser/'}
+        # but returned username is for 'testuser', which already exists for another identity
+        openid_resp =  {'nickname': 'testuser', 'fullname': 'Test User',
+                 'email': '[e-mail]'}
+        self._do_user_login(openid_req, openid_resp)
+        response = self.client.get('/getuser/')
+
+        # Since this username is already taken by someone else, we go through
+        # 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.assertEquals(response.content, 'testuser9')
+
+    def test_login_duplicate_username_numbering_with_nonsequential_matches(self):
+        settings.OPENID_FOLLOW_RENAMES = False
+        settings.OPENID_CREATE_USERS = True
+        settings.OPENID_UPDATE_DETAILS_FROM_SREG = True
+        # Setup existing user who's name we're going to conflict with
+        user = User.objects.create_user('testuser', '[e-mail]')
+        user = User.objects.create_user('testuserfoo', '[e-mail]')
+
+        # identity url is for 'renameuser'
+        openid_req = {'openid_identifier': 'http://example.com/identity',
+               'next': '/getuser/'}
+        # but returned username is for 'testuser', which already exists for another identity
+        openid_resp =  {'nickname': 'testuser', 'fullname': 'Test User',
+                 'email': '[e-mail]'}
+        self._do_user_login(openid_req, openid_resp)
+        response = self.client.get('/getuser/')
+
+        # Since this username is already taken by someone else, we go through
+        # 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.assertEquals(response.content, 'testuser3')
+
     def test_login_follow_rename(self):
         settings.OPENID_FOLLOW_RENAMES = True
         settings.OPENID_UPDATE_DETAILS_FROM_SREG = True

=== removed file 'django_openid_auth/tests/test_views.py.~1~'
--- django_openid_auth/tests/test_views.py.~1~	2012-06-27 08:25:19 +0000
+++ django_openid_auth/tests/test_views.py.~1~	1970-01-01 00:00:00 +0000
@@ -1,1258 +0,0 @@
-# django-openid-auth -  OpenID integration for django.contrib.auth
-#
-# Copyright (C) 2009-2010 Canonical Ltd.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# * Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# 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 cgi
-import unittest
-from urllib import quote_plus
-
-from django.conf import settings
-from django.contrib.auth.models import User, Group
-from django.http import HttpRequest, HttpResponse
-from django.test import TestCase
-from openid.consumer.consumer import Consumer, SuccessResponse
-from openid.consumer.discover import OpenIDServiceEndpoint
-from openid.extensions import ax, sreg, pape
-from openid.fetchers import (
-    HTTPFetcher, HTTPFetchingError, HTTPResponse, setDefaultFetcher)
-from openid.oidutil import importElementTree
-from openid.server.server import BROWSER_REQUEST_MODES, ENCODE_URL, Server
-from openid.store.memstore import MemoryStore
-from openid.message import OPENID1_URL_LIMIT, IDENTIFIER_SELECT
-
-from django_openid_auth import teams
-from django_openid_auth.models import UserOpenID
-from django_openid_auth.views import (
-    sanitise_redirect_url, 
-    make_consumer,
-)
-from django_openid_auth.auth import OpenIDBackend
-from django_openid_auth.signals import openid_login_complete
-from django_openid_auth.store import DjangoOpenIDStore
-from django_openid_auth.exceptions import (
-    MissingUsernameViolation,
-    DuplicateUsernameViolation,
-    MissingPhysicalMultiFactor,
-    RequiredAttributeNotReturned,
-)
-
-ET = importElementTree()
-
-class StubOpenIDProvider(HTTPFetcher):
-
-    def __init__(self, base_url):
-        self.store = MemoryStore()
-        self.identity_url = base_url + 'identity'
-        self.localid_url = base_url + 'localid'
-        self.endpoint_url = base_url + 'endpoint'
-        self.server = Server(self.store, self.endpoint_url)
-        self.last_request = None
-        self.type_uris = ['http://specs.openid.net/auth/2.0/signon']
-
-    def fetch(self, url, body=None, headers=None):
-        if url == self.identity_url:
-            # Serve an XRDS document directly, pointing at our endpoint.
-            type_uris = ['<Type>%s</Type>' % uri for uri in self.type_uris]
-            return HTTPResponse(
-                url, 200, {'content-type': 'application/xrds+xml'}, """\
-<?xml version="1.0"?>
-<xrds:XRDS
-    xmlns="xri://$xrd*($v*2.0)"
-    xmlns:xrds="xri://$xrds">
-  <XRD>
-    <Service priority="0">
-      %s
-      <URI>%s</URI>
-      <LocalID>%s</LocalID>
-    </Service>
-  </XRD>
-</xrds:XRDS>
-""" % ('\n'.join(type_uris), self.endpoint_url, self.localid_url))
-        elif url.startswith(self.endpoint_url):
-            # Gather query parameters
-            query = {}
-            if '?' in url:
-                query.update(cgi.parse_qsl(url.split('?', 1)[1]))
-            if body is not None:
-                query.update(cgi.parse_qsl(body))
-            self.last_request = self.server.decodeRequest(query)
-
-            # The browser based requests should not be handled through
-            # the fetcher interface.
-            assert self.last_request.mode not in BROWSER_REQUEST_MODES
-
-            response = self.server.handleRequest(self.last_request)
-            webresponse = self.server.encodeResponse(response)
-            return HTTPResponse(url,  webresponse.code, webresponse.headers,
-                                webresponse.body)
-        else:
-            raise HTTPFetchingError('unknown URL %s' % url)
-
-    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')
-        tree = ET.XML(content)
-        form = tree.find('.//form')
-        assert form is not None, 'No form in document'
-        assert form.get('action') == self.endpoint_url, (
-            'Form posts to %s instead of %s' % (form.get('action'),
-                                                self.endpoint_url))
-        query = {}
-        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')
-        self.last_request = self.server.decodeRequest(query)
-        return self.last_request
-
-
-class DummyDjangoRequest(object):
-    def __init__(self, request_path):
-        self.request_path = request_path
-        self.META = {
-            'HTTP_HOST': "localhost",
-            'SCRIPT_NAME': "http://localhost",
-            'SERVER_PROTOCOL': "http",
-        }
-        self.POST = {
-            'openid_identifier': "http://example.com/identity",
-        }
-        self.GET = {}
-        self.session = {}
-
-    def get_full_path(self):
-        return self.META['SCRIPT_NAME'] + self.request_path
-
-    def build_absolute_uri(self):
-        return self.META['SCRIPT_NAME'] + self.request_path
-        
-    def _combined_request(self):
-        request = {}
-        request.update(self.POST)
-        request.update(self.GET)
-        return request
-    REQUEST = property(_combined_request)
-
-class RelyingPartyTests(TestCase):
-    urls = 'django_openid_auth.tests.urls'
-
-    def setUp(self):
-        super(RelyingPartyTests, self).setUp()
-        self.provider = StubOpenIDProvider('http://example.com/')
-        self.req = DummyDjangoRequest('http://localhost/')
-        self.endpoint = OpenIDServiceEndpoint()
-        self.endpoint.claimed_id = 'http://example.com/identity'
-        self.endpoint.server_url = 'http://example.com/'
-        self.consumer = make_consumer(self.req)
-        self.server = Server(DjangoOpenIDStore())
-        setDefaultFetcher(self.provider, wrap_exceptions=False)
-
-        self.old_login_redirect_url = getattr(settings, 'LOGIN_REDIRECT_URL', '/accounts/profile/')
-        self.old_create_users = getattr(settings, 'OPENID_CREATE_USERS', False)
-        self.old_strict_usernames = getattr(settings, 'OPENID_STRICT_USERNAMES', False)
-        self.old_update_details = getattr(settings, 'OPENID_UPDATE_DETAILS_FROM_SREG', False)
-        self.old_sso_server_url = getattr(settings, 'OPENID_SSO_SERVER_URL', None)
-        self.old_teams_map = getattr(settings, 'OPENID_LAUNCHPAD_TEAMS_MAPPING', {})
-        self.old_use_as_admin_login = getattr(settings, 'OPENID_USE_AS_ADMIN_LOGIN', False)
-        self.old_follow_renames = getattr(settings, 'OPENID_FOLLOW_RENAMES', False)
-        self.old_physical_multifactor = getattr(settings, 'OPENID_PHYSICAL_MULTIFACTOR_REQUIRED', False)
-        self.old_login_render_failure = getattr(settings, 'OPENID_RENDER_FAILURE', None)
-        self.old_consumer_complete = Consumer.complete
-
-        self.old_required_fields = getattr(
-            settings, 'OPENID_SREG_REQUIRED_FIELDS', [])
-
-        settings.OPENID_CREATE_USERS = False
-        settings.OPENID_STRICT_USERNAMES = False
-        settings.OPENID_UPDATE_DETAILS_FROM_SREG = False
-        settings.OPENID_SSO_SERVER_URL = None
-        settings.OPENID_LAUNCHPAD_TEAMS_MAPPING = {}
-        settings.OPENID_USE_AS_ADMIN_LOGIN = False
-        settings.OPENID_FOLLOW_RENAMES = False
-        settings.OPENID_PHYSICAL_MULTIFACTOR_REQUIRED = False
-        settings.OPENID_SREG_REQUIRED_FIELDS = []
-
-    def tearDown(self):
-        settings.LOGIN_REDIRECT_URL = self.old_login_redirect_url
-        settings.OPENID_CREATE_USERS = self.old_create_users
-        settings.OPENID_STRICT_USERNAMES = self.old_strict_usernames
-        settings.OPENID_UPDATE_DETAILS_FROM_SREG = self.old_update_details
-        settings.OPENID_SSO_SERVER_URL = self.old_sso_server_url
-        settings.OPENID_LAUNCHPAD_TEAMS_MAPPING = self.old_teams_map
-        settings.OPENID_USE_AS_ADMIN_LOGIN = self.old_use_as_admin_login
-        settings.OPENID_FOLLOW_RENAMES = self.old_follow_renames
-        settings.OPENID_PHYSICAL_MULTIFACTOR_REQUIRED = self.old_physical_multifactor
-        settings.OPENID_RENDER_FAILURE = self.old_login_render_failure
-        Consumer.complete = self.old_consumer_complete
-        settings.OPENID_SREG_REQUIRED_FIELDS = self.old_required_fields
-
-        setDefaultFetcher(None)
-        super(RelyingPartyTests, self).tearDown()
-
-    def complete(self, openid_response):
-        """Complete an OpenID authentication request."""
-        # The server can generate either a redirect or a form post
-        # here.  For simplicity, force generation of a redirect.
-        openid_response.whichEncoding = lambda: ENCODE_URL
-        webresponse = self.provider.server.encodeResponse(openid_response)
-        self.assertEquals(webresponse.code, 302)
-        redirect_to = webresponse.headers['location']
-        self.assertTrue(redirect_to.startswith(
-                'http://testserver/openid/complete/'))
-        return self.client.get('/openid/complete/',
-            dict(cgi.parse_qsl(redirect_to.split('?', 1)[1])))
-
-    def test_login(self):
-        user = User.objects.create_user('someuser', '[e-mail]')
-        useropenid = UserOpenID(
-            user=user,
-            claimed_id='http://example.com/identity',
-            display_id='http://example.com/identity')
-        useropenid.save()
-
-        # The login form is displayed:
-        response = self.client.get('/openid/login/')
-        self.assertTemplateUsed(response, 'openid/login.html')
-
-        # Posting in an identity URL begins the authentication request:
-        response = self.client.post('/openid/login/',
-            {'openid_identifier': 'http://example.com/identity',
-             'next': '/getuser/'})
-        self.assertContains(response, 'OpenID transaction in progress')
-
-        openid_request = self.provider.parseFormPost(response.content)
-        self.assertEquals(openid_request.mode, 'checkid_setup')
-        self.assertTrue(openid_request.return_to.startswith(
-                'http://testserver/openid/complete/'))
-
-        # Complete the request.  The user is redirected to the next URL.
-        openid_response = openid_request.answer(True)
-        response = self.complete(openid_response)
-        self.assertRedirects(response, 'http://testserver/getuser/')
-
-        # And they are now logged in:
-        response = self.client.get('/getuser/')
-        self.assertEquals(response.content, 'someuser')
-
-    def test_login_no_next(self):
-        """Logins with no next parameter redirect to LOGIN_REDIRECT_URL."""
-        user = User.objects.create_user('someuser', '[e-mail]')
-        useropenid = UserOpenID(
-            user=user,
-            claimed_id='http://example.com/identity',
-            display_id='http://example.com/identity')
-        useropenid.save()
-
-        settings.LOGIN_REDIRECT_URL = '/getuser/'
-        response = self.client.post('/openid/login/',
-            {'openid_identifier': 'http://example.com/identity'})
-        self.assertContains(response, 'OpenID transaction in progress')
-
-        openid_request = self.provider.parseFormPost(response.content)
-        self.assertEquals(openid_request.mode, 'checkid_setup')
-        self.assertTrue(openid_request.return_to.startswith(
-                'http://testserver/openid/complete/'))
-
-        # Complete the request.  The user is redirected to the next URL.
-        openid_response = openid_request.answer(True)
-        response = self.complete(openid_response)
-        self.assertRedirects(
-            response, 'http://testserver' + settings.LOGIN_REDIRECT_URL)
-
-    def test_login_sso(self):
-        settings.OPENID_SSO_SERVER_URL = 'http://example.com/identity'
-        user = User.objects.create_user('someuser', '[e-mail]')
-        useropenid = UserOpenID(
-            user=user,
-            claimed_id='http://example.com/identity',
-            display_id='http://example.com/identity')
-        useropenid.save()
-
-        # Requesting the login form immediately begins an
-        # authentication request.
-        response = self.client.get('/openid/login/', {'next': '/getuser/'})
-        self.assertEquals(response.status_code, 200)
-        self.assertContains(response, 'OpenID transaction in progress')
-
-        openid_request = self.provider.parseFormPost(response.content)
-        self.assertEquals(openid_request.mode, 'checkid_setup')
-        self.assertTrue(openid_request.return_to.startswith(
-                'http://testserver/openid/complete/'))
-
-        # Complete the request.  The user is redirected to the next URL.
-        openid_response = openid_request.answer(True)
-        response = self.complete(openid_response)
-        self.assertRedirects(response, 'http://testserver/getuser/')
-
-        # And they are now logged in:
-        response = self.client.get('/getuser/')
-        self.assertEquals(response.content, 'someuser')
-
-    def test_login_create_users(self):
-        settings.OPENID_CREATE_USERS = True
-        # Create a user with the same name as we'll pass back via sreg.
-        User.objects.create_user('someuser', '[e-mail]')
-
-        # Posting in an identity URL begins the authentication request:
-        response = self.client.post('/openid/login/',
-            {'openid_identifier': 'http://example.com/identity',
-             'next': '/getuser/'})
-        self.assertContains(response, 'OpenID transaction in progress')
-
-        # Complete the request, passing back some simple registration
-        # data.  The user is redirected to the next URL.
-        openid_request = self.provider.parseFormPost(response.content)
-        sreg_request = sreg.SRegRequest.fromOpenIDRequest(openid_request)
-        openid_response = openid_request.answer(True)
-        sreg_response = sreg.SRegResponse.extractResponse(
-            sreg_request, {'nickname': 'someuser', 'fullname': 'Some User',
-                           'email': '[e-mail]'})
-        openid_response.addExtension(sreg_response)
-        response = self.complete(openid_response)
-        self.assertRedirects(response, 'http://testserver/getuser/')
-
-        # 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.assertEquals(response.content, 'someuser2')
-
-        # Check the details of the new user.
-        user = User.objects.get(username='someuser2')
-        self.assertEquals(user.first_name, 'Some')
-        self.assertEquals(user.last_name, 'User')
-        self.assertEquals(user.email, '[e-mail]')
-
-    def _do_user_login(self, req_data, resp_data, use_sreg=True, use_pape=None):
-        openid_request = self._get_login_request(req_data)
-        openid_response = self._get_login_response(openid_request, resp_data, use_sreg, use_pape)
-        response = self.complete(openid_response)
-        self.assertRedirects(response, 'http://testserver/getuser/')
-        return response
-
-    def _get_login_request(self, req_data):
-        # Posting in an identity URL begins the authentication request:
-        response = self.client.post('/openid/login/', req_data)
-        self.assertContains(response, 'OpenID transaction in progress')
-
-        # Complete the request, passing back some simple registration
-        # data.  The user is redirected to the next URL.
-        openid_request = self.provider.parseFormPost(response.content)
-        return openid_request
-
-    def _get_login_response(self, openid_request, resp_data, use_sreg, use_pape):
-        openid_response = openid_request.answer(True)
-
-        if use_sreg:
-            sreg_request = sreg.SRegRequest.fromOpenIDRequest(openid_request)
-            sreg_response = sreg.SRegResponse.extractResponse(
-                sreg_request, resp_data)
-            openid_response.addExtension(sreg_response)
-        if use_pape is not None:
-            policies = [
-                use_pape
-            ]
-            pape_response = pape.Response(auth_policies=policies)
-            openid_response.addExtension(pape_response)
-        return openid_response
-
-    def parse_query_string(self, query_str):
-        query_items = map(tuple,
-            [item.split('=') for item in query_str.split('&')])
-        query = dict(query_items)
-        return query
-
-    def test_login_physical_multifactor_request(self):
-        settings.OPENID_PHYSICAL_MULTIFACTOR_REQUIRED = True
-        preferred_auth = pape.AUTH_MULTI_FACTOR_PHYSICAL
-        self.provider.type_uris.append(pape.ns_uri)
-        
-        openid_req = {'openid_identifier': 'http://example.com/identity',
-               'next': '/getuser/'}
-        response = self.client.post('/openid/login/', openid_req)
-        openid_request = self.provider.parseFormPost(response.content)
-
-        request_auth = openid_request.message.getArg(
-            'http://specs.openid.net/extensions/pape/1.0',
-            'preferred_auth_policies',
-        )
-        self.assertEqual(request_auth, preferred_auth)
-
-    def test_login_physical_multifactor_response(self):
-        settings.OPENID_PHYSICAL_MULTIFACTOR_REQUIRED = True
-        preferred_auth = pape.AUTH_MULTI_FACTOR_PHYSICAL
-        self.provider.type_uris.append(pape.ns_uri)
-
-        def mock_complete(this, request_args, return_to):
-            request = {'openid.mode': 'checkid_setup',
-                       'openid.trust_root': 'http://localhost/',
-                       'openid.return_to': 'http://localhost/',
-                       'openid.identity': IDENTIFIER_SELECT,
-                       'openid.ns.pape' : pape.ns_uri,
-                       'openid.pape.auth_policies': request_args.get('openid.pape.auth_policies', pape.AUTH_NONE),
-            }
-            openid_server = self.provider.server
-            orequest = openid_server.decodeRequest(request)
-            response = SuccessResponse(
-                self.endpoint, orequest.message,
-                signed_fields=['openid.pape.auth_policies',])
-            return response
-        Consumer.complete = mock_complete
-
-        user = User.objects.create_user('testuser', '[e-mail]')
-        useropenid = UserOpenID(
-            user=user,
-            claimed_id='http://example.com/identity',
-            display_id='http://example.com/identity')
-        useropenid.save()
-
-        openid_req = {'openid_identifier': 'http://example.com/identity',
-               'next': '/getuser/'}
-        openid_resp =  {'nickname': 'testuser', 'fullname': 'Openid User',
-                 'email': '[e-mail]'}
-
-        response = self._do_user_login(openid_req, openid_resp, use_pape=pape.AUTH_MULTI_FACTOR_PHYSICAL)
-
-        query = self.parse_query_string(response.request['QUERY_STRING'])
-        self.assertTrue('openid.pape.auth_policies' in query)
-        self.assertEqual(query['openid.pape.auth_policies'], 
-                quote_plus(preferred_auth))
-
-        response = self.client.get('/getuser/')
-        self.assertEqual(response.content, 'testuser')
-
-
-    def test_login_physical_multifactor_not_provided(self):
-        settings.OPENID_PHYSICAL_MULTIFACTOR_REQUIRED = True
-        preferred_auth = pape.AUTH_MULTI_FACTOR_PHYSICAL
-        self.provider.type_uris.append(pape.ns_uri)
-
-        def mock_complete(this, request_args, return_to):
-            request = {'openid.mode': 'checkid_setup',
-                       'openid.trust_root': 'http://localhost/',
-                       'openid.return_to': 'http://localhost/',
-                       'openid.identity': IDENTIFIER_SELECT,
-                       'openid.ns.pape' : pape.ns_uri,
-                       'openid.pape.auth_policies': request_args.get('openid.pape.auth_policies', pape.AUTH_NONE),
-            }
-            openid_server = self.provider.server
-            orequest = openid_server.decodeRequest(request)
-            response = SuccessResponse(
-                self.endpoint, orequest.message,
-                signed_fields=['openid.pape.auth_policies',])
-            return response
-        Consumer.complete = mock_complete
-
-        user = User.objects.create_user('testuser', '[e-mail]')
-        useropenid = UserOpenID(    
-            user=user,
-            claimed_id='http://example.com/identity',
-            display_id='http://example.com/identity')
-        useropenid.save()
-
-        openid_req = {'openid_identifier': 'http://example.com/identity',
-               'next': '/getuser/'}
-        openid_resp =  {'nickname': 'testuser', 'fullname': 'Openid User',
-                 'email': '[e-mail]'}
-
-        openid_request = self._get_login_request(openid_req)
-        openid_response = self._get_login_response(openid_request, openid_req, openid_resp, use_pape=pape.AUTH_NONE)
-
-        response_auth = openid_request.message.getArg(
-            'http://specs.openid.net/extensions/pape/1.0',
-            'auth_policies',
-        )
-        self.assertNotEqual(response_auth, preferred_auth)
-
-        response = self.complete(openid_response)
-        self.assertEquals(403, response.status_code)
-        self.assertContains(response, '<h1>OpenID failed</h1>', status_code=403)
-        self.assertContains(response, '<p>Login requires physical multi-factor authentication.</p>', status_code=403)
-
-    def test_login_physical_multifactor_not_provided_override(self):
-        settings.OPENID_PHYSICAL_MULTIFACTOR_REQUIRED = True
-        preferred_auth = pape.AUTH_MULTI_FACTOR_PHYSICAL
-        self.provider.type_uris.append(pape.ns_uri)
-
-        # Override the login_failure handler
-        def mock_login_failure_handler(request, message, status=403,
-                                       template_name=None,
-                                       exception=None):
-           self.assertTrue(isinstance(exception, MissingPhysicalMultiFactor))
-           return HttpResponse('Test Failure Override', status=200)
-        settings.OPENID_RENDER_FAILURE = mock_login_failure_handler
-
-        def mock_complete(this, request_args, return_to):
-            request = {'openid.mode': 'checkid_setup',
-                       'openid.trust_root': 'http://localhost/',
-                       'openid.return_to': 'http://localhost/',
-                       'openid.identity': IDENTIFIER_SELECT,
-                       'openid.ns.pape' : pape.ns_uri,
-                       'openid.pape.auth_policies': request_args.get('openid.pape.auth_policies', pape.AUTH_NONE),
-            }
-            openid_server = self.provider.server
-            orequest = openid_server.decodeRequest(request)
-            response = SuccessResponse(
-                self.endpoint, orequest.message,
-                signed_fields=['openid.pape.auth_policies',])
-            return response
-        Consumer.complete = mock_complete
-
-        user = User.objects.create_user('testuser', '[e-mail]')
-        useropenid = UserOpenID(    
-            user=user,
-            claimed_id='http://example.com/identity',
-            display_id='http://example.com/identity')
-        useropenid.save()
-
-        openid_req = {'openid_identifier': 'http://example.com/identity',
-               'next': '/getuser/'}
-        openid_resp =  {'nickname': 'testuser', 'fullname': 'Openid User',
-                 'email': '[e-mail]'}
-
-        openid_request = self._get_login_request(openid_req)
-        openid_response = self._get_login_response(openid_request, openid_req, openid_resp, use_pape=pape.AUTH_NONE)
-
-        response_auth = openid_request.message.getArg(
-            'http://specs.openid.net/extensions/pape/1.0',
-            'auth_policies',
-        )
-        self.assertNotEqual(response_auth, preferred_auth)
-
-        # Status code should be 200, since we over-rode the login_failure handler
-        response = self.complete(openid_response)
-        self.assertEquals(200, response.status_code)
-        self.assertContains(response, 'Test Failure Override')
-
-    def test_login_without_nickname(self):
-        settings.OPENID_CREATE_USERS = True
-
-        openid_req = {'openid_identifier': 'http://example.com/identity',
-               'next': '/getuser/'}
-        openid_resp =  {'nickname': '', 'fullname': 'Openid User',
-                 'email': '[e-mail]'}
-        self._do_user_login(openid_req, openid_resp)
-        response = self.client.get('/getuser/')
-
-        # username defaults to 'openiduser'
-        self.assertEquals(response.content, 'openiduser')
-
-        # The user's full name and email have been updated.
-        user = User.objects.get(username=response.content)
-        self.assertEquals(user.first_name, 'Openid')
-        self.assertEquals(user.last_name, 'User')
-        self.assertEquals(user.email, '[e-mail]')
-
-    def test_login_follow_rename(self):
-        settings.OPENID_FOLLOW_RENAMES = True
-        settings.OPENID_UPDATE_DETAILS_FROM_SREG = True
-        user = User.objects.create_user('testuser', '[e-mail]')
-        useropenid = UserOpenID(
-            user=user,
-            claimed_id='http://example.com/identity',
-            display_id='http://example.com/identity')
-        useropenid.save()
-
-        openid_req = {'openid_identifier': 'http://example.com/identity',
-               'next': '/getuser/'}
-        openid_resp =  {'nickname': 'someuser', 'fullname': 'Some User',
-                 'email': '[e-mail]'}
-        self._do_user_login(openid_req, openid_resp)
-        response = self.client.get('/getuser/')
-
-        # If OPENID_FOLLOW_RENAMES, they are logged in as
-        # someuser (the passed in nickname has changed the username)
-        self.assertEquals(response.content, 'someuser')
-
-        # The user's full name and email have been updated.
-        user = User.objects.get(username=response.content)
-        self.assertEquals(user.first_name, 'Some')
-        self.assertEquals(user.last_name, 'User')
-        self.assertEquals(user.email, '[e-mail]')
-
-    def test_login_follow_rename_without_nickname_change(self):
-        settings.OPENID_FOLLOW_RENAMES = True
-        settings.OPENID_UPDATE_DETAILS_FROM_SREG = True
-        settings.OPENID_STRICT_USERNAMES = True
-        user = User.objects.create_user('testuser', '[e-mail]')
-        useropenid = UserOpenID(
-            user=user,
-            claimed_id='http://example.com/identity',
-            display_id='http://example.com/identity')
-        useropenid.save()
-
-        openid_req = {'openid_identifier': 'http://example.com/identity',
-               'next': '/getuser/'}
-        openid_resp =  {'nickname': 'testuser', 'fullname': 'Some User',
-                 'email': '[e-mail]'}
-        self._do_user_login(openid_req, openid_resp)
-        response = self.client.get('/getuser/')
-
-        # Username should not have changed
-        self.assertEquals(response.content, 'testuser')
-
-        # The user's full name and email have been updated.
-        user = User.objects.get(username=response.content)
-        self.assertEquals(user.first_name, 'Some')
-        self.assertEquals(user.last_name, 'User')
-        self.assertEquals(user.email, '[e-mail]')
-
-    def test_login_follow_rename_conflict(self):
-        settings.OPENID_FOLLOW_RENAMES = True
-        settings.OPENID_UPDATE_DETAILS_FROM_SREG = True
-        # Setup existing user who's name we're going to switch to
-        user = User.objects.create_user('testuser', '[e-mail]')
-        UserOpenID.objects.get_or_create(
-            user=user,
-            claimed_id='http://example.com/existing_identity',
-            display_id='http://example.com/existing_identity')
-
-        # Setup user who is going to try to change username to 'testuser'
-        renamed_user = User.objects.create_user('renameuser', '[e-mail]')
-        UserOpenID.objects.get_or_create(
-            user=renamed_user,
-            claimed_id='http://example.com/identity',
-            display_id='http://example.com/identity')
-
-        # identity url is for 'renameuser'
-        openid_req = {'openid_identifier': 'http://example.com/identity',
-               'next': '/getuser/'}
-        # but returned username is for 'testuser', which already exists for another identity
-        openid_resp =  {'nickname': 'testuser', 'fullname': 'Rename User',
-                 'email': '[e-mail]'}
-        self._do_user_login(openid_req, openid_resp)
-        response = self.client.get('/getuser/')
-
-        # 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.assertEquals(response.content, 'testuser2')
-
-        # The user's full name and email have been updated.
-        user = User.objects.get(username=response.content)
-        self.assertEquals(user.first_name, 'Rename')
-        self.assertEquals(user.last_name, 'User')
-        self.assertEquals(user.email, '[e-mail]')
-
-    def test_login_follow_rename_false_onlyonce(self):
-        settings.OPENID_FOLLOW_RENAMES = True
-        settings.OPENID_UPDATE_DETAILS_FROM_SREG = True
-        # Setup existing user who's name we're going to switch to
-        user = User.objects.create_user('testuser', '[e-mail]')
-        UserOpenID.objects.get_or_create(
-            user=user,
-            claimed_id='http://example.com/existing_identity',
-            display_id='http://example.com/existing_identity')
-
-        # Setup user who is going to try to change username to 'testuser'
-        renamed_user = User.objects.create_user('testuser2000eight', '[e-mail]')
-        UserOpenID.objects.get_or_create(
-            user=renamed_user,
-            claimed_id='http://example.com/identity',
-            display_id='http://example.com/identity')
-
-        # identity url is for 'testuser2000eight'
-        openid_req = {'openid_identifier': 'http://example.com/identity',
-               'next': '/getuser/'}
-        # but returned username is for 'testuser', which already exists for another identity
-        openid_resp =  {'nickname': 'testuser2', 'fullname': 'Rename User',
-                 'email': '[e-mail]'}
-        self._do_user_login(openid_req, openid_resp)
-        response = self.client.get('/getuser/')
-
-        # 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.  Even though it looks like 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.assertEquals(response.content, 'testuser2')
-
-        # The user's full name and email have been updated.
-        user = User.objects.get(username=response.content)
-        self.assertEquals(user.first_name, 'Rename')
-        self.assertEquals(user.last_name, 'User')
-        self.assertEquals(user.email, '[e-mail]')
-
-    def test_login_follow_rename_conflict_onlyonce(self):
-        settings.OPENID_FOLLOW_RENAMES = True
-        settings.OPENID_UPDATE_DETAILS_FROM_SREG = True
-        # Setup existing user who's name we're going to switch to
-        user = User.objects.create_user('testuser', '[e-mail]')
-        UserOpenID.objects.get_or_create(
-            user=user,
-            claimed_id='http://example.com/existing_identity',
-            display_id='http://example.com/existing_identity')
-
-        # Setup user who is going to try to change username to 'testuser'
-        renamed_user = User.objects.create_user('testuser2000', '[e-mail]')
-        UserOpenID.objects.get_or_create(
-            user=renamed_user,
-            claimed_id='http://example.com/identity',
-            display_id='http://example.com/identity')
-
-        # identity url is for 'testuser2000'
-        openid_req = {'openid_identifier': 'http://example.com/identity',
-               'next': '/getuser/'}
-        # but returned username is for 'testuser', which already exists for another identity
-        openid_resp =  {'nickname': 'testuser', 'fullname': 'Rename User',
-                 'email': '[e-mail]'}
-        self._do_user_login(openid_req, openid_resp)
-        response = self.client.get('/getuser/')
-
-        # 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.  Since the user for this identity url
-        # already has a name matching that pattern, check if first.
-        self.assertEquals(response.content, 'testuser2000')
-
-        # The user's full name and email have been updated.
-        user = User.objects.get(username=response.content)
-        self.assertEquals(user.first_name, 'Rename')
-        self.assertEquals(user.last_name, 'User')
-        self.assertEquals(user.email, '[e-mail]')
-
-    def test_login_follow_rename_false_conflict(self):
-        settings.OPENID_FOLLOW_RENAMES = True
-        settings.OPENID_UPDATE_DETAILS_FROM_SREG = True
-        # Setup existing user who's username matches the name+i pattern
-        user = User.objects.create_user('testuser2', '[e-mail]')
-        UserOpenID.objects.get_or_create(
-            user=user,
-            claimed_id='http://example.com/identity',
-            display_id='http://example.com/identity')
-
-        # identity url is for 'testuser2'
-        openid_req = {'openid_identifier': 'http://example.com/identity',
-               'next': '/getuser/'}
-        # but returned username is for 'testuser', which looks like we've done
-        # a username+1 for them already, but 'testuser' isn't actually taken
-        openid_resp =  {'nickname': 'testuser', 'fullname': 'Same User',
-                 'email': '[e-mail]'}
-        self._do_user_login(openid_req, openid_resp)
-        response = self.client.get('/getuser/')
-
-        # If OPENID_FOLLOW_RENAMES, username should be changed to 'testuser'
-        # because it wasn't currently taken
-        self.assertEquals(response.content, 'testuser')
-
-        # The user's full name and email have been updated.
-        user = User.objects.get(username=response.content)
-        self.assertEquals(user.first_name, 'Same')
-        self.assertEquals(user.last_name, 'User')
-        self.assertEquals(user.email, '[e-mail]')
-
-    def test_strict_username_no_nickname(self):
-        settings.OPENID_CREATE_USERS = True
-        settings.OPENID_STRICT_USERNAMES = True
-        settings.OPENID_SREG_REQUIRED_FIELDS = []
-
-        # Posting in an identity URL begins the authentication request:
-        response = self.client.post('/openid/login/',
-            {'openid_identifier': 'http://example.com/identity',
-             'next': '/getuser/'})
-        self.assertContains(response, 'OpenID transaction in progress')
-
-        # Complete the request, passing back some simple registration
-        # data.  The user is redirected to the next URL.
-        openid_request = self.provider.parseFormPost(response.content)
-        sreg_request = sreg.SRegRequest.fromOpenIDRequest(openid_request)
-        openid_response = openid_request.answer(True)
-        sreg_response = sreg.SRegResponse.extractResponse(
-            sreg_request, {'nickname': '', # No nickname
-                           'fullname': 'Some User',
-                           'email': '[e-mail]'})
-        openid_response.addExtension(sreg_response)
-        response = self.complete(openid_response)
-
-        # Status code should be 403: Forbidden
-        self.assertEquals(403, response.status_code)
-        self.assertContains(response, '<h1>OpenID failed</h1>', status_code=403)
-        self.assertContains(response, "An attribute required for logging in was not returned "
-            "(nickname)", status_code=403)
-
-    def test_strict_username_no_nickname_override(self):
-        settings.OPENID_CREATE_USERS = True
-        settings.OPENID_STRICT_USERNAMES = True
-        settings.OPENID_SREG_REQUIRED_FIELDS = []
-
-        # Override the login_failure handler
-        def mock_login_failure_handler(request, message, status=403,
-                                       template_name=None,
-                                       exception=None):
-           self.assertTrue(isinstance(exception, (RequiredAttributeNotReturned, MissingUsernameViolation)))
-           return HttpResponse('Test Failure Override', status=200)
-        settings.OPENID_RENDER_FAILURE = mock_login_failure_handler
-        
-        # Posting in an identity URL begins the authentication request:
-        response = self.client.post('/openid/login/',
-            {'openid_identifier': 'http://example.com/identity',
-             'next': '/getuser/'})
-        self.assertContains(response, 'OpenID transaction in progress')
-
-        # Complete the request, passing back some simple registration
-        # data.  The user is redirected to the next URL.
-        openid_request = self.provider.parseFormPost(response.content)
-        sreg_request = sreg.SRegRequest.fromOpenIDRequest(openid_request)
-        openid_response = openid_request.answer(True)
-        sreg_response = sreg.SRegResponse.extractResponse(
-            sreg_request, {'nickname': '', # No nickname
-                           'fullname': 'Some User',
-                           'email': '[e-mail]'})
-        openid_response.addExtension(sreg_response)
-        response = self.complete(openid_response)
-            
-        # Status code should be 200, since we over-rode the login_failure handler
-        self.assertEquals(200, response.status_code)
-        self.assertContains(response, 'Test Failure Override')
-
-    def test_strict_username_duplicate_user(self):
-        settings.OPENID_CREATE_USERS = True
-        settings.OPENID_STRICT_USERNAMES = True
-        # Create a user with the same name as we'll pass back via sreg.
-        user = User.objects.create_user('someuser', '[e-mail]')
-        useropenid = UserOpenID(
-            user=user,
-            claimed_id='http://example.com/different_identity',
-            display_id='http://example.com/different_identity')
-        useropenid.save()
-
-        # Posting in an identity URL begins the authentication request:
-        response = self.client.post('/openid/login/',
-            {'openid_identifier': 'http://example.com/identity',
-             'next': '/getuser/'})
-        self.assertContains(response, 'OpenID transaction in progress')
-
-        # Complete the request, passing back some simple registration
-        # data.  The user is redirected to the next URL.
-        openid_request = self.provider.parseFormPost(response.content)
-        sreg_request = sreg.SRegRequest.fromOpenIDRequest(openid_request)
-        openid_response = openid_request.answer(True)
-        sreg_response = sreg.SRegResponse.extractResponse(
-            sreg_request, {'nickname': 'someuser', 'fullname': 'Some User',
-                           'email': '[e-mail]'})
-        openid_response.addExtension(sreg_response)
-        response = self.complete(openid_response)
-
-        # Status code should be 403: Forbidden
-        self.assertEquals(403, response.status_code)
-        self.assertContains(response, '<h1>OpenID failed</h1>', status_code=403)
-        self.assertContains(response,
-            "The username (someuser) with which you tried to log in is "
-            "already in use for a different account.",
-            status_code=403)
-
-    def test_strict_username_duplicate_user_override(self):
-        settings.OPENID_CREATE_USERS = True
-        settings.OPENID_STRICT_USERNAMES = True
-
-        # Override the login_failure handler
-        def mock_login_failure_handler(request, message, status=403,
-                                       template_name=None,
-                                       exception=None):
-           self.assertTrue(isinstance(exception, DuplicateUsernameViolation))
-           return HttpResponse('Test Failure Override', status=200)
-        settings.OPENID_RENDER_FAILURE = mock_login_failure_handler
-
-        # Create a user with the same name as we'll pass back via sreg.
-        user = User.objects.create_user('someuser', '[e-mail]')
-        useropenid = UserOpenID(
-            user=user,
-            claimed_id='http://example.com/different_identity',
-            display_id='http://example.com/different_identity')
-        useropenid.save()
-
-        # Posting in an identity URL begins the authentication request:
-        response = self.client.post('/openid/login/',
-            {'openid_identifier': 'http://example.com/identity',
-             'next': '/getuser/'})
-        self.assertContains(response, 'OpenID transaction in progress')
-
-        # Complete the request, passing back some simple registration
-        # data.  The user is redirected to the next URL.
-        openid_request = self.provider.parseFormPost(response.content)
-        sreg_request = sreg.SRegRequest.fromOpenIDRequest(openid_request)
-        openid_response = openid_request.answer(True)
-        sreg_response = sreg.SRegResponse.extractResponse(
-            sreg_request, {'nickname': 'someuser', 'fullname': 'Some User',
-                           'email': '[e-mail]'})
-        openid_response.addExtension(sreg_response)
-        response = self.complete(openid_response)
-        
-        # Status code should be 200, since we over-rode the login_failure handler
-        self.assertEquals(200, response.status_code)
-        self.assertContains(response, 'Test Failure Override')
-
-    def test_login_requires_sreg_required_fields(self):
-        # If any required attributes are not included in the response,
-        # we fail with a forbidden.
-        settings.OPENID_CREATE_USERS = True
-        settings.OPENID_SREG_REQUIRED_FIELDS = ('email', 'language')
-        # Posting in an identity URL begins the authentication request:
-        response = self.client.post('/openid/login/',
-            {'openid_identifier': 'http://example.com/identity',
-             'next': '/getuser/'})
-        self.assertContains(response, 'OpenID transaction in progress')
-
-        # Complete the request, passing back some simple registration
-        # data.  The user is redirected to the next URL.
-        openid_request = self.provider.parseFormPost(response.content)
-        sreg_request = sreg.SRegRequest.fromOpenIDRequest(openid_request)
-        openid_response = openid_request.answer(True)
-        sreg_response = sreg.SRegResponse.extractResponse(
-            sreg_request, {'nickname': 'foo',
-                           'fullname': 'Some User',
-                           'email': '[e-mail]'})
-        openid_response.addExtension(sreg_response)
-        response = self.complete(openid_response)
-
-        # Status code should be 403: Forbidden as we didn't include
-        # a required field - language.
-        self.assertContains(response,
-            "An attribute required for logging in was not returned "
-            "(language)", status_code=403)
-
-    def test_login_update_details(self):
-        settings.OPENID_UPDATE_DETAILS_FROM_SREG = True
-        user = User.objects.create_user('testuser', '[e-mail]')
-        useropenid = UserOpenID(
-            user=user,
-            claimed_id='http://example.com/identity',
-            display_id='http://example.com/identity')
-        useropenid.save()
-
-        openid_req = {'openid_identifier': 'http://example.com/identity',
-               'next': '/getuser/'}
-        openid_resp =  {'nickname': 'testuser', 'fullname': 'Some User',
-                 'email': '[e-mail]'}
-        self._do_user_login(openid_req, openid_resp)
-        response = self.client.get('/getuser/')
-
-        self.assertEquals(response.content, 'testuser')
-
-        # The user's full name and email have been updated.
-        user = User.objects.get(username=response.content)
-        self.assertEquals(user.first_name, 'Some')
-        self.assertEquals(user.last_name, 'User')
-        self.assertEquals(user.email, '[e-mail]')
-
-    def test_login_uses_sreg_extra_fields(self):
-        # The configurable sreg attributes are used in the request.
-        settings.OPENID_SREG_EXTRA_FIELDS = ('language',)
-        user = User.objects.create_user('testuser', '[e-mail]')
-        useropenid = UserOpenID(
-            user=user,
-            claimed_id='http://example.com/identity',
-            display_id='http://example.com/identity')
-        useropenid.save()
-
-        # Posting in an identity URL begins the authentication request:
-        response = self.client.post('/openid/login/',
-            {'openid_identifier': 'http://example.com/identity',
-             'next': '/getuser/'})
-
-        openid_request = self.provider.parseFormPost(response.content)
-        sreg_request = sreg.SRegRequest.fromOpenIDRequest(openid_request)
-        for field in ('email', 'fullname', 'nickname', 'language'):
-            self.assertTrue(field in sreg_request)
-
-    def test_login_uses_sreg_required_fields(self):
-        # The configurable sreg attributes are used in the request.
-        settings.OPENID_SREG_REQUIRED_FIELDS = ('email', 'language')
-        user = User.objects.create_user('testuser', '[e-mail]')
-        useropenid = UserOpenID(
-            user=user,
-            claimed_id='http://example.com/identity',
-            display_id='http://example.com/identity')
-        useropenid.save()
-
-        # Posting in an identity URL begins the authentication request:
-        response = self.client.post('/openid/login/',
-            {'openid_identifier': 'http://example.com/identity',
-             'next': '/getuser/'})
-
-        openid_request = self.provider.parseFormPost(response.content)
-        sreg_request = sreg.SRegRequest.fromOpenIDRequest(openid_request)
-
-        self.assertEqual(['email', 'language'], sreg_request.required)
-        self.assertEqual(['fullname', 'nickname'], sreg_request.optional)
-
-    def test_login_attribute_exchange(self):
-        settings.OPENID_UPDATE_DETAILS_FROM_SREG = True
-        user = User.objects.create_user('testuser', '[e-mail]')
-        useropenid = UserOpenID(
-            user=user,
-            claimed_id='http://example.com/identity',
-            display_id='http://example.com/identity')
-        useropenid.save()
-
-        # Configure the provider to advertise attribute exchange
-        # protocol and start the authentication process:
-        self.provider.type_uris.append('http://openid.net/srv/ax/1.0')
-        response = self.client.post('/openid/login/',
-            {'openid_identifier': 'http://example.com/identity',
-             'next': '/getuser/'})
-        self.assertContains(response, 'OpenID transaction in progress')
-
-        # The resulting OpenID request uses the Attribute Exchange
-        # extension rather than the Simple Registration extension.
-        openid_request = self.provider.parseFormPost(response.content)
-        sreg_request = sreg.SRegRequest.fromOpenIDRequest(openid_request)
-        self.assertEqual(sreg_request.required, [])
-        self.assertEqual(sreg_request.optional, [])
-
-        fetch_request = ax.FetchRequest.fromOpenIDRequest(openid_request)
-        self.assertTrue(fetch_request.has_key(
-                'http://axschema.org/contact/email'))
-        self.assertTrue(fetch_request.has_key(
-                'http://axschema.org/namePerson'))
-        self.assertTrue(fetch_request.has_key(
-                'http://axschema.org/namePerson/first'))
-        self.assertTrue(fetch_request.has_key(
-                'http://axschema.org/namePerson/last'))
-        self.assertTrue(fetch_request.has_key(
-                'http://axschema.org/namePerson/friendly'))
-        # myOpenID compatibilty attributes:
-        self.assertTrue(fetch_request.has_key(
-                'http://schema.openid.net/contact/email'))
-        self.assertTrue(fetch_request.has_key(
-                'http://schema.openid.net/namePerson'))
-        self.assertTrue(fetch_request.has_key(
-                'http://schema.openid.net/namePerson/friendly'))
-
-        # Build up a response including AX data.
-        openid_response = openid_request.answer(True)
-        fetch_response = ax.FetchResponse(fetch_request)
-        fetch_response.addValue(
-            'http://axschema.org/contact/email', '[e-mail]')
-        fetch_response.addValue(
-            'http://axschema.org/namePerson/first', 'Firstname')
-        fetch_response.addValue(
-            'http://axschema.org/namePerson/last', 'Lastname')
-        fetch_response.addValue(
-            'http://axschema.org/namePerson/friendly', 'someuser')
-        openid_response.addExtension(fetch_response)
-        response = self.complete(openid_response)
-        self.assertRedirects(response, 'http://testserver/getuser/')
-
-        # And they are now logged in as testuser (the passed in
-        # nickname has not caused the username to change).
-        response = self.client.get('/getuser/')
-        self.assertEquals(response.content, 'testuser')
-
-        # The user's full name and email have been updated.
-        user = User.objects.get(username='testuser')
-        self.assertEquals(user.first_name, 'Firstname')
-        self.assertEquals(user.last_name, 'Lastname')
-        self.assertEquals(user.email, '[e-mail]')
-
-    def test_login_teams(self):
-        settings.OPENID_LAUNCHPAD_TEAMS_MAPPING_AUTO = False
-        settings.OPENID_LAUNCHPAD_TEAMS_MAPPING = {'teamname': 'groupname',
-                                                   'otherteam': 'othergroup'}
-        user = User.objects.create_user('testuser', '[e-mail]')
-        group = Group(name='groupname')
-        group.save()
-        ogroup = Group(name='othergroup')
-        ogroup.save()
-        user.groups.add(ogroup)
-        user.save()
-        useropenid = UserOpenID(
-            user=user,
-            claimed_id='http://example.com/identity',
-            display_id='http://example.com/identity')
-        useropenid.save()
-
-        # Posting in an identity URL begins the authentication request:
-        response = self.client.post('/openid/login/',
-            {'openid_identifier': 'http://example.com/identity',
-             'next': '/getuser/'})
-        self.assertContains(response, 'OpenID transaction in progress')
-
-        # Complete the request
-        openid_request = self.provider.parseFormPost(response.content)
-        openid_response = openid_request.answer(True)
-        teams_request = teams.TeamsRequest.fromOpenIDRequest(openid_request)
-        teams_response = teams.TeamsResponse.extractResponse(
-            teams_request, 'teamname,some-other-team')
-        openid_response.addExtension(teams_response)
-        response = self.complete(openid_response)
-        self.assertRedirects(response, 'http://testserver/getuser/')
-
-        # And they are now logged in as testuser
-        response = self.client.get('/getuser/')
-        self.assertEquals(response.content, 'testuser')
-
-        # The user's groups have been updated.
-        user = User.objects.get(username='testuser')
-        self.assertTrue(group in user.groups.all())
-        self.assertTrue(ogroup not in user.groups.all())
-
-    def test_login_teams_automapping(self):
-        settings.OPENID_LAUNCHPAD_TEAMS_MAPPING = {'teamname': 'groupname',
-                                                   'otherteam': 'othergroup'}
-        settings.OPENID_LAUNCHPAD_TEAMS_MAPPING_AUTO = True
-        settings.OPENID_LAUNCHPAD_TEAMS_MAPPING_AUTO_BLACKLIST = ['django-group1', 'django-group2']
-        user = User.objects.create_user('testuser', '[e-mail]')
-        group1 = Group(name='django-group1')
-        group1.save()
-        group2 = Group(name='django-group2')
-        group2.save()
-        group3 = Group(name='django-group3')
-        group3.save()
-        user.save()
-        useropenid = UserOpenID(
-            user=user,
-            claimed_id='http://example.com/identity',
-            display_id='http://example.com/identity')
-        useropenid.save()
-
-        # Posting in an identity URL begins the authentication request:
-        response = self.client.post('/openid/login/',
-            {'openid_identifier': 'http://example.com/identity',
-             'next': '/getuser/'})
-        self.assertContains(response, 'OpenID transaction in progress')
-
-        # Complete the request
-        openid_request = self.provider.parseFormPost(response.content)
-        openid_response = openid_request.answer(True)
-        teams_request = teams.TeamsRequest.fromOpenIDRequest(openid_request)
-
-        self.assertEqual(group1 in user.groups.all(), False)
-        self.assertEqual(group2 in user.groups.all(), False)
-        self.assertTrue(group3 not in user.groups.all())
-
-    def test_login_teams_staff_not_defined(self):
-        delattr(settings, 'OPENID_LAUNCHPAD_STAFF_TEAMS')
-        user = User.objects.create_user('testuser', '[e-mail]')
-        user.is_staff = True
-        user.save()
-        self.assertTrue(user.is_staff)
-
-        user = self.get_openid_authed_user_with_teams(user, 'teamname,some-other-team')
-        self.assertTrue(user.is_staff)
-
-    def test_login_teams_staff_assignment(self):
-        settings.OPENID_LAUNCHPAD_STAFF_TEAMS = ('teamname',)
-        user = User.objects.create_user('testuser', '[e-mail]')
-        user.is_staff = False
-        user.save()
-        self.assertFalse(user.is_staff)
-
-        user = self.get_openid_authed_user_with_teams(user, 'teamname,some-other-team')
-        self.assertTrue(user.is_staff)
-
-    def test_login_teams_staff_unassignment(self):
-        settings.OPENID_LAUNCHPAD_STAFF_TEAMS = ('different-teamname',)
-        user = User.objects.create_user('testuser', '[e-mail]')
-        user.is_staff = True
-        user.save()
-        self.assertTrue(user.is_staff)
-
-        user = self.get_openid_authed_user_with_teams(user, 'teamname,some-other-team')
-        self.assertFalse(user.is_staff)
-
-    def get_openid_authed_user_with_teams(self, user, teams_str):
-        useropenid = UserOpenID(
-            user=user,
-            claimed_id='http://example.com/identity',
-            display_id='http://example.com/identity')
-        useropenid.save()
-
-        # Posting in an identity URL begins the authentication request:
-        response = self.client.post('/openid/login/',
-            {'openid_identifier': 'http://example.com/identity'})
-
-        # Complete the request
-        openid_request = self.provider.parseFormPost(response.content)
-        openid_response = openid_request.answer(True)
-        teams_request = teams.TeamsRequest.fromOpenIDRequest(openid_request)
-        teams_response = teams.TeamsResponse.extractResponse(
-            teams_request, teams_str)
-        openid_response.addExtension(teams_response)
-        response = self.complete(openid_response)
-        return User.objects.get(username=user.username)
-
-    def test_login_complete_signals_login(self):
-        # An oauth_login_complete signal is emitted including the
-        # request and sreg_response.
-        user = User.objects.create_user('someuser', '[e-mail]')
-        useropenid = UserOpenID(
-            user=user,
-            claimed_id='http://example.com/identity',
-            display_id='http://example.com/identity')
-        useropenid.save()
-        response = self.client.post('/openid/login/',
-            {'openid_identifier': 'http://example.com/identity'})
-        openid_request = self.provider.parseFormPost(response.content)
-        openid_response = openid_request.answer(True)
-        # Use a closure to test whether the signal handler was called.
-        self.signal_handler_called = False
-        def login_callback(sender, **kwargs):
-            self.assertTrue(isinstance(
-                kwargs.get('request', None), HttpRequest))
-            self.assertTrue(isinstance(
-                kwargs.get('openid_response', None), SuccessResponse))
-            self.signal_handler_called = True
-        openid_login_complete.connect(login_callback)
-
-        response = self.complete(openid_response)
-
-        self.assertTrue(self.signal_handler_called)
-        openid_login_complete.disconnect(login_callback)
-
-    
-class HelperFunctionsTest(TestCase):
-    def test_sanitise_redirect_url(self):
-        settings.ALLOWED_EXTERNAL_OPENID_REDIRECT_DOMAINS = [
-            "example.com", "example.org"]
-        # list of URLs and whether they should be passed or not
-        urls = [
-            ("http://example.com", True),
-            ("http://example.org/", True),
-            ("http://example.org/foo/bar", True),
-            ("http://example.org/foo/bar?baz=quux", True),
-            ("http://example.org:9999/foo/bar?baz=quux", True),
-            ("http://www.example.org/", False),
-            ("http://example.net/foo/bar?baz=quux", False),
-            ("/somewhere/local", True),
-            ("/somewhere/local?url=http://fail.com/bar", True),
-            # An empty path, as seen when no "next" parameter is passed.
-            ("", False),
-            ("/path with spaces", False),
-        ]
-        for url, returns_self in urls:
-            sanitised = sanitise_redirect_url(url)
-            if returns_self:
-                self.assertEqual(url, sanitised)
-            else:
-                self.assertEqual(settings.LOGIN_REDIRECT_URL, sanitised)
-
-def suite():
-    return unittest.TestLoader().loadTestsFromName(__name__)

=== removed file 'django_openid_auth/tests/test_views.pyc'
Binary files django_openid_auth/tests/test_views.pyc	2012-06-27 08:25:19 +0000 and django_openid_auth/tests/test_views.pyc	1970-01-01 00:00:00 +0000 differ
=== modified file 'django_openid_auth/tests/urls.py'
--- django_openid_auth/tests/urls.py	2010-12-03 00:46:25 +0000
+++ django_openid_auth/tests/urls.py	2013-03-26 11:57:40 +0000
@@ -1,6 +1,6 @@
 # django-openid-auth -  OpenID integration for django.contrib.auth
 #
-# Copyright (C) 2009-2010 Canonical Ltd.
+# Copyright (C) 2009-2013 Canonical Ltd.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions

=== removed file 'django_openid_auth/tests/urls.pyc'
Binary files django_openid_auth/tests/urls.pyc	2012-06-27 08:25:19 +0000 and django_openid_auth/tests/urls.pyc	1970-01-01 00:00:00 +0000 differ
=== modified file 'django_openid_auth/urls.py'
--- django_openid_auth/urls.py	2010-12-03 00:46:25 +0000
+++ django_openid_auth/urls.py	2013-03-26 11:57:40 +0000
@@ -1,7 +1,7 @@
 # django-openid-auth -  OpenID integration for django.contrib.auth
 #
 # Copyright (C) 2007 Simon Willison
-# Copyright (C) 2008-2010 Canonical Ltd.
+# Copyright (C) 2008-2013 Canonical Ltd.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions

=== removed file 'django_openid_auth/urls.pyc'
Binary files django_openid_auth/urls.pyc	2012-06-27 08:25:19 +0000 and django_openid_auth/urls.pyc	1970-01-01 00:00:00 +0000 differ
=== modified file 'django_openid_auth/views.py'
--- django_openid_auth/views.py	2012-06-27 08:25:19 +0000
+++ django_openid_auth/views.py	2013-03-26 11:57:40 +0000
@@ -1,7 +1,7 @@
 # django-openid-auth -  OpenID integration for django.contrib.auth
 #
 # Copyright (C) 2007 Simon Willison
-# Copyright (C) 2008-2010 Canonical Ltd.
+# Copyright (C) 2008-2013 Canonical Ltd.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -244,7 +244,11 @@
             return_to += '&'
         else:
             return_to += '?'
-        return_to += urllib.urlencode({redirect_field_name: redirect_to})
+        # 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(
+            {redirect_field_name: redirect_to.encode("UTF-8")})
 
     return render_openid_request(request, openid_request, return_to)
 

=== removed file 'django_openid_auth/views.pyc'
Binary files django_openid_auth/views.pyc	2012-06-27 08:25:19 +0000 and django_openid_auth/views.pyc	1970-01-01 00:00:00 +0000 differ
=== modified file 'example_consumer/__init__.py'
--- example_consumer/__init__.py	2010-12-03 00:46:25 +0000
+++ example_consumer/__init__.py	2013-03-26 11:57:40 +0000
@@ -1,7 +1,7 @@
 # django-openid-auth -  OpenID integration for django.contrib.auth
 #
 # Copyright (C) 2007 Simon Willison
-# Copyright (C) 2008-2010 Canonical Ltd.
+# Copyright (C) 2008-2013 Canonical Ltd.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions

=== modified file 'example_consumer/settings.py'
--- example_consumer/settings.py	2012-06-27 08:25:19 +0000
+++ example_consumer/settings.py	2013-03-26 11:57:40 +0000
@@ -1,7 +1,7 @@
 # django-openid-auth -  OpenID integration for django.contrib.auth
 #
 # Copyright (C) 2007 Simon Willison
-# Copyright (C) 2008-2010 Canonical Ltd.
+# Copyright (C) 2008-2013 Canonical Ltd.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -28,7 +28,8 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 # Django settings for example project.
-
+import django
+django_version = django.get_version()
 DEBUG = True
 TEMPLATE_DEBUG = DEBUG
 
@@ -38,13 +39,30 @@
 
 MANAGERS = ADMINS
 
-DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': 'example_consumer/test.db3',
-    }
-}
-
+if django_version >= "1.2": 
+    csrf_middleware = 'django.middleware.csrf.CsrfViewMiddleware'
+    DATABASES = {
+                     'default': {
+                         'ENGINE': 'django.db.backends.sqlite3',
+                         'NAME': 'sqlite.db'
+                     }
+                 }
+    TEMPLATE_LOADERS = (
+        'django.template.loaders.filesystem.Loader',
+        'django.template.loaders.app_directories.Loader',
+    )
+else:
+    csrf_middleware = 'django.contrib.csrf.middleware.CsrfViewMiddleware'
+    TEMPLATE_LOADERS = (
+        'django.template.loaders.filesystem.load_template_source',
+        'django.template.loaders.app_directories.load_template_source',
+     )
+    DATABASE_ENGINE = 'sqlite3'           # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'ado_mssql'.
+    DATABASE_NAME = 'sqlite.db'             # Or path to database file if using sqlite3.
+    DATABASE_USER = ''             # Not used with sqlite3.
+    DATABASE_PASSWORD = ''         # Not used with sqlite3.
+    DATABASE_HOST = ''             # Set to empty string for localhost. Not used with sqlite3.
+    DATABASE_PORT = ''             # Set to empty string for default. Not used with sqlite3.
 
 # Local time zone for this installation. Choices can be found here:
 # http://www.postgresql.org/docs/8.1/static/datetime-keywords.html#DATETIME-TIMEZONE-SET-TABLE
@@ -80,23 +98,6 @@
 # Make this unique, and don't share it with anybody.
 SECRET_KEY = '34958734985734985734985798437'
 
-# List of callables that know how to import templates from various sources.
-TEMPLATE_LOADERS = (
-    'django.template.loaders.filesystem.Loader',
-    'django.template.loaders.app_directories.Loader',
-#    'django.template.loaders.eggs.Loader',
-)
-
-# django-openid-auth will *not* work with Django 1.1.1 or older, as it's
-# missing the csrf_token template tag.  This will allow it to work with
-# Django 1.1.2 or later:
-try: 
-    import django.middleware.csrf
-except ImportError:
-    csrf_middleware = 'django.contrib.csrf.middleware.CsrfViewMiddleware'
-else:
-    csrf_middleware = 'django.middleware.csrf.CsrfViewMiddleware'
-
 MIDDLEWARE_CLASSES = (
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',

=== modified file 'example_consumer/urls.py'
--- example_consumer/urls.py	2010-12-03 00:46:25 +0000
+++ example_consumer/urls.py	2013-03-26 11:57:40 +0000
@@ -1,7 +1,7 @@
 # django-openid-auth -  OpenID integration for django.contrib.auth
 #
 # Copyright (C) 2007 Simon Willison
-# Copyright (C) 2008-2010 Canonical Ltd.
+# Copyright (C) 2008-2013 Canonical Ltd.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -41,5 +41,5 @@
     (r'^logout/$', 'django.contrib.auth.views.logout'),
     (r'^private/$', views.require_authentication),
 
-    (r'^admin/(.*)', admin.site.root),
+    (r'^admin/', include(admin.site.urls)),
 )

=== modified file 'example_consumer/views.py'
--- example_consumer/views.py	2010-12-03 00:46:25 +0000
+++ example_consumer/views.py	2013-03-26 11:57:40 +0000
@@ -1,7 +1,7 @@
 # django-openid-auth -  OpenID integration for django.contrib.auth
 #
 # Copyright (C) 2007 Simon Willison
-# Copyright (C) 2008-2010 Canonical Ltd.
+# Copyright (C) 2008-2013 Canonical Ltd.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions

=== removed file 'openid.html'
--- openid.html	2012-06-27 08:25:19 +0000
+++ openid.html	1970-01-01 00:00:00 +0000
@@ -1,150 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-  "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head><title>OpenID in Django</title></head>
-<body>
-<h1>OpenID in Django</h1>
-<p>The <tt class="docutils literal"><span class="pre">django_openidconsumer</span></tt> package contains all of the code needed to set up
-your Django application as an OpenID consumer. You can use it to allow OpenID
-users to sign in to your site without having to create a new username and
-password.</p>
-<div class="section">
-<h2><a id="overview">Overview</a></h2>
-<p>The OpenID consumer system consists of:</p>
-<ul class="simple">
-<li>Views for you to hook in to your application.</li>
-<li>Database models implementing the persistence layer of an OpenID consumer.</li>
-<li>Middleware that makes <tt class="docutils literal"><span class="pre">request.openid</span></tt> and <tt class="docutils literal"><span class="pre">request.openids</span></tt>
-properties available to your application views.</li>
-</ul>
-</div>
-<div class="section">
-<h2><a id="dependencies">Dependencies</a></h2>
-<p><tt class="docutils literal"><span class="pre">django_openidconsumer</span></tt> uses the <a class="reference" href="http://www.openidenabled.com/openid/libraries/python/">python-openid library</a>, which must be
-installed separately somewhere on the Python path. You should install the 1.2.0
-&#8220;combo&#8221; package which includes the <tt class="docutils literal"><span class="pre">yadis</span></tt> and <tt class="docutils literal"><span class="pre">urljr</span></tt> libraries.</p>
-<p>The package also depends on the availability of Django&#8217;s <a class="reference" href="http://www.djangoproject.com/documentation/sessions/">session support</a>.</p>
-</div>
-<div class="section">
-<h2><a id="installation">Installation</a></h2>
-<p>Having ensured that both the  <tt class="docutils literal"><span class="pre">python-openid</span></tt> library and the <tt class="docutils literal"><span class="pre">django_openidconsumer</span></tt> package are available on your Python path, you can
-add OpenID consumer support to an application by doing the following:</p>
-<ol class="arabic">
-<li><p class="first">Put <tt class="docutils literal"><span class="pre">django_openidconsumer</span></tt> in your <tt class="docutils literal"><span class="pre">INSTALLED_APPS</span></tt> setting.</p>
-</li>
-<li><p class="first">Run the command <tt class="docutils literal"><span class="pre">manage.py</span> <span class="pre">syncdb</span></tt> to create the necessary tables.</p>
-</li>
-<li><p class="first">Add <tt class="docutils literal"><span class="pre">django_openidconsumer.middleware.OpenIDMiddleware</span></tt> to your list
-of <tt class="docutils literal"><span class="pre">MIDDLEWARE_CLASSES</span></tt>, somewhere after the Session middleware.</p>
-</li>
-<li><p class="first">Add the following views to your urlconf:</p>
-<pre class="literal-block">
-(r'^openid/$', 'django_openidconsumer.views.begin'),
-(r'^openid/complete/$', 'django_openidconsumer.views.complete'),
-(r'^openid/signout/$', 'django_openidconsumer.views.signout'),
-</pre>
-</li>
-</ol>
-<p>You will then be able to browse to <tt class="docutils literal"><span class="pre">example.com/openid/</span></tt> and sign in using
-an OpenID.</p>
-</div>
-<div class="section">
-<h2><a id="using-the-openid-middleware">Using the OpenID middleware</a></h2>
-<p>With the Middleware installed, your views will have access to the user&#8217;s OpenID
-as the <tt class="docutils literal"><span class="pre">request.openid</span></tt> property. This will be <tt class="docutils literal"><span class="pre">None</span></tt> if the user has not
-yet authenticated; otherwise it will be a <tt class="docutils literal"><span class="pre">django_openidconsumer.util.OpenID</span></tt>
-instance.</p>
-<p>If you want the user&#8217;s OpenID as a string, call the <tt class="docutils literal"><span class="pre">str()</span></tt> builtin on the
-OpenID instance:</p>
-<pre class="literal-block">
-def example_view(request):
-    if request.openid:
-        return HttpResponse(&quot;OpenID is %s&quot; % escape(str(request.openid)))
-    else:
-        return HttpResponse(&quot;No OpenID&quot;)
-</pre>
-<p>Users can sign in with more than one OpenID. This is supported by the
-<tt class="docutils literal"><span class="pre">request.openids</span></tt> property, which is a list of <tt class="docutils literal"><span class="pre">OpenID</span></tt> objects in the order
-in which they were authenticated. <tt class="docutils literal"><span class="pre">request.openid</span></tt> merely returns the last
-item in this list.</p>
-</div>
-<div class="section">
-<h2><a id="using-simple-registration">Using simple registration</a></h2>
-<p>Simple registration (or <a class="reference" href="http://openid.net/specs/openid-simple-registration-extension-1_0.html">sreg</a>) is an extension to the OpenID specification
-that  allows you to request extra details about a user from their OpenID
-provider. It is frequently used to pre-populate registration forms with
-information such as the user&#8217;s name, e-mail address or date of birth.</p>
-<p>Be aware that not all OpenID providers support sreg, and there is no guarantee
-that the information you have requested will be returned. Simple registration
-should be used as a convenience for your users rather than as a required step in
-your authentication process.</p>
-<p>Available simple registration fields are <tt class="docutils literal"><span class="pre">nickname</span></tt>, <tt class="docutils literal"><span class="pre">email</span></tt>, <tt class="docutils literal"><span class="pre">fullname</span></tt>,
-<tt class="docutils literal"><span class="pre">dob</span></tt>, <tt class="docutils literal"><span class="pre">gender</span></tt>, <tt class="docutils literal"><span class="pre">postcode</span></tt>, <tt class="docutils literal"><span class="pre">country</span></tt>, <tt class="docutils literal"><span class="pre">language</span></tt> and <tt class="docutils literal"><span class="pre">timezone</span></tt>.
-Full details are available in the <a class="reference" href="http://openid.net/specs/openid-simple-registration-extension-1_0.html">spec</a>.</p>
-<p>To request this information, pass the fields that you wish to retrieve as an
-additional <tt class="docutils literal"><span class="pre">sreg</span></tt> argument to the <tt class="docutils literal"><span class="pre">django_openidconsumer.views.begin</span></tt> view:</p>
-<pre class="literal-block">
-(r'^openid/$', 'django_openidconsumer.views.begin', {
-    'sreg': 'email,nickname'
-}),
-</pre>
-<p>Any simple registration fields that are returned will be available in a
-dictionary as the <tt class="docutils literal"><span class="pre">sreg</span></tt> property of the OpenID object:</p>
-<pre class="literal-block">
-def example_sreg(request):
-    if request.openid and request.openid.sreg.has_key('email'):
-        return HttpResponse(&quot;Your e-mail address is: %s&quot; % escape(
-            request.openid.sreg['email']
-        ))
-    else:
-        return HttpResponse(&quot;No e-mail address&quot;)
-</pre>
-</div>
-<div class="section">
-<h2><a id="customisation">Customisation</a></h2>
-<p><tt class="docutils literal"><span class="pre">django_openidconsumer</span></tt> uses two templates:</p>
-<dl class="docutils">
-<dt><tt class="docutils literal"><span class="pre">openid_signin.html</span></tt></dt>
-<dd>The form presented to the user when they sign in.</dd>
-<dt><tt class="docutils literal"><span class="pre">openid_failure.html</span></tt></dt>
-<dd>The template used to display an error message when something goes wrong.</dd>
-</dl>
-<p>You can over-ride the default templates by creating templates of the same name
-and placing them somewhere on your template path. You can find the example
-templates in the <tt class="docutils literal"><span class="pre">django_openidconsumer/templates</span></tt> directory.</p>
-<p>The OpenID specification strongly recommends that any OpenID registration form
-has a <tt class="docutils literal"><span class="pre">name</span></tt> attribute of <tt class="docutils literal"><span class="pre">openid_url</span></tt> to aid browser autocompletion, and
-displays the <a class="reference" href="http://openid.net/login-bg.gif">OpenID logo</a> inline in the form field using the following CSS:</p>
-<pre class="literal-block">
-input.openid {
-  background: url(/path/to/login-bg.gif) no-repeat;
-  background-position: 0 50%;
-  padding-left: 16px;
-}
-</pre>
-<p>By default, the package expects the <tt class="docutils literal"><span class="pre">django_openidconsumer.views.complete</span></tt>
-view to be located at <tt class="docutils literal"><span class="pre">/openid/complete/</span></tt>. This is the view that the OpenID
-provider will redirect the user to after they have authenticated. If you want to
-put it somewhere else you can either pass an extra <tt class="docutils literal"><span class="pre">redirect_to</span></tt> argument to
-<tt class="docutils literal"><span class="pre">django_openidconsumer.views.begin</span></tt> or add an <tt class="docutils literal"><span class="pre">OPENID_REDIRECT_TO</span></tt> setting
-to <tt class="docutils literal"><span class="pre">settings.py</span></tt>.</p>
-<p>You can pass a <tt class="docutils literal"><span class="pre">?next=</span></tt> query string argument containing a relative URL to
-the <tt class="docutils literal"><span class="pre">begin</span></tt> view to control where the user will be redirected to having
-returned to your site. You can also set the default redirection location
-using the <tt class="docutils literal"><span class="pre">OPENID_REDIRECT_NEXT</span></tt> setting; if you do set set a default the user
-will be redirected to your homepage.</p>
-</div>
-<div class="section">
-<h2><a id="i-names">i-names</a></h2>
-<p><a class="reference" href="http://www.inames.net/">i-names</a> are part of the OpenID 2.0 specification, which is currently being
-developed. They are supported by the python-openid library, and hence are also
-supported by <tt class="docutils literal"><span class="pre">django_openidconsumer</span></tt>. You can tell if an OpenID is an i-name
-by checking the <tt class="docutils literal"><span class="pre">request.openid.is_iname</span></tt> property.</p>
-<p>If you wish to disable i-name support, you can do so by adding the following to
-your <tt class="docutils literal"><span class="pre">settings.py</span></tt>:</p>
-<pre class="literal-block">
-OPENID_DISALLOW_INAMES = True
-</pre>
-</div>
-</body>
-</html>
\ No newline at end of file

=== removed file 'openid.txt'
--- openid.txt	2012-06-27 08:25:19 +0000
+++ openid.txt	1970-01-01 00:00:00 +0000
@@ -1,165 +0,0 @@
-================
-OpenID in Django
-================
-
-The ``django_openidconsumer`` package contains all of the code needed to set up 
-your Django application as an OpenID consumer. You can use it to allow OpenID  
-users to sign in to your site without having to create a new username and 
-password.
-
-Overview
-========
-
-The OpenID consumer system consists of:
-
-    * Views for you to hook in to your application.
-    * Database models implementing the persistence layer of an OpenID consumer.
-    * Middleware that makes ``request.openid`` and ``request.openids`` 
-      properties available to your application views.
-
-Dependencies
-============
-
-``django_openidconsumer`` uses the `python-openid library`_, which must be 
-installed separately somewhere on the Python path. You should install the 1.2.0
-"combo" package which includes the ``yadis`` and ``urljr`` libraries.
-
-The package also depends on the availability of Django's `session support`_.
-
-.. _python-openid library: http://www.openidenabled.com/openid/libraries/python/
-.. _session support: http://www.djangoproject.com/documentation/sessions/
-
-Installation
-============
-
-Having ensured that both the  ``python-openid`` library and the ``django_openidconsumer`` package are available on your Python path, you can 
-add OpenID consumer support to an application by doing the following:
-
-    1. Put ``django_openidconsumer`` in your ``INSTALLED_APPS`` setting.
-    2. Run the command ``manage.py syncdb`` to create the necessary tables.
-    3. Add ``django_openidconsumer.middleware.OpenIDMiddleware`` to your list
-       of ``MIDDLEWARE_CLASSES``, somewhere after the Session middleware.
-    4. Add the following views to your urlconf::
-        
-        (r'^openid/$', 'django_openidconsumer.views.begin'),
-        (r'^openid/complete/$', 'django_openidconsumer.views.complete'),
-        (r'^openid/signout/$', 'django_openidconsumer.views.signout'),
-
-You will then be able to browse to ``example.com/openid/`` and sign in using 
-an OpenID.
-
-Using the OpenID middleware
-===========================
-
-With the Middleware installed, your views will have access to the user's OpenID
-as the ``request.openid`` property. This will be ``None`` if the user has not 
-yet authenticated; otherwise it will be a ``django_openidconsumer.util.OpenID`` 
-instance.
-
-If you want the user's OpenID as a string, call the ``str()`` builtin on the
-OpenID instance::
-
-    def example_view(request):
-        if request.openid:
-            return HttpResponse("OpenID is %s" % escape(str(request.openid)))
-        else:
-            return HttpResponse("No OpenID")
-
-Users can sign in with more than one OpenID. This is supported by the 
-``request.openids`` property, which is a list of ``OpenID`` objects in the order
-in which they were authenticated. ``request.openid`` merely returns the last 
-item in this list.
-
-Using simple registration
-=========================
-
-Simple registration (or `sreg`_) is an extension to the OpenID specification 
-that  allows you to request extra details about a user from their OpenID 
-provider. It is frequently used to pre-populate registration forms with 
-information such as the user's name, e-mail address or date of birth.
-
-.. _sreg: http://openid.net/specs/openid-simple-registration-extension-1_0.html
-
-Be aware that not all OpenID providers support sreg, and there is no guarantee
-that the information you have requested will be returned. Simple registration 
-should be used as a convenience for your users rather than as a required step in
-your authentication process.
-
-Available simple registration fields are ``nickname``, ``email``, ``fullname``,
-``dob``, ``gender``, ``postcode``, ``country``, ``language`` and ``timezone``. 
-Full details are available in the `spec`_.
-
-.. _spec: http://openid.net/specs/openid-simple-registration-extension-1_0.html
-
-To request this information, pass the fields that you wish to retrieve as an 
-additional ``sreg`` argument to the ``django_openidconsumer.views.begin`` view::
-
-    (r'^openid/$', 'django_openidconsumer.views.begin', {
-        'sreg': 'email,nickname'
-    }),
-
-Any simple registration fields that are returned will be available in a 
-dictionary as the ``sreg`` property of the OpenID object::
-
-    def example_sreg(request):
-        if request.openid and request.openid.sreg.has_key('email'):
-            return HttpResponse("Your e-mail address is: %s" % escape(
-                request.openid.sreg['email']
-            ))
-        else:
-            return HttpResponse("No e-mail address")
-
-Customisation
-=============
-
-``django_openidconsumer`` uses two templates:
-
-``openid_signin.html``
-    The form presented to the user when they sign in.
-
-``openid_failure.html``
-    The template used to display an error message when something goes wrong.
-
-You can over-ride the default templates by creating templates of the same name 
-and placing them somewhere on your template path. You can find the example 
-templates in the ``django_openidconsumer/templates`` directory.
-
-The OpenID specification strongly recommends that any OpenID registration form
-has a ``name`` attribute of ``openid_url`` to aid browser autocompletion, and 
-displays the `OpenID logo`_ inline in the form field using the following CSS::
-
-    input.openid {
-      background: url(/path/to/login-bg.gif) no-repeat; 
-      background-position: 0 50%;
-      padding-left: 16px;
-    }
-
-.. _OpenID logo: http://openid.net/login-bg.gif
-
-By default, the package expects the ``django_openidconsumer.views.complete`` 
-view to be located at ``/openid/complete/``. This is the view that the OpenID 
-provider will redirect the user to after they have authenticated. If you want to
-put it somewhere else you can either pass an extra ``redirect_to`` argument to  
-``django_openidconsumer.views.begin`` or add an ``OPENID_REDIRECT_TO`` setting 
-to ``settings.py``.
-
-You can pass a ``?next=`` query string argument containing a relative URL to 
-the ``begin`` view to control where the user will be redirected to having 
-returned to your site. You can also set the default redirection location 
-using the ``OPENID_REDIRECT_NEXT`` setting; if you do set set a default the user
-will be redirected to your homepage.
-
-i-names
-=======
-
-`i-names`_ are part of the OpenID 2.0 specification, which is currently being 
-developed. They are supported by the python-openid library, and hence are also 
-supported by ``django_openidconsumer``. You can tell if an OpenID is an i-name 
-by checking the ``request.openid.is_iname`` property.
-
-.. _i-names: http://www.inames.net/
-
-If you wish to disable i-name support, you can do so by adding the following to
-your ``settings.py``::
-
-    OPENID_DISALLOW_INAMES = True

=== modified file 'setup.py'
--- setup.py	2012-06-27 08:25:19 +0000
+++ setup.py	2013-03-26 11:57:40 +0000
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # django-openid-auth -  OpenID integration for django.contrib.auth
 #
-# Copyright (C) 2009-2010 Canonical Ltd.
+# Copyright (C) 2009-2013 Canonical Ltd.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -43,7 +43,7 @@
 
 
 description, long_description = __doc__.split('\n\n', 1)
-VERSION = '0.4'
+VERSION = '0.5'
 
 setup(
     name='django-openid-auth',