Commit e09735ff by Michael Hall

Merge from prerequisite branch

parents 8eab59f1 b7f4b8e8
...@@ -42,16 +42,13 @@ from openid.fetchers import ( ...@@ -42,16 +42,13 @@ from openid.fetchers import (
from openid.oidutil import importElementTree from openid.oidutil import importElementTree
from openid.server.server import BROWSER_REQUEST_MODES, ENCODE_URL, Server from openid.server.server import BROWSER_REQUEST_MODES, ENCODE_URL, Server
from openid.store.memstore import MemoryStore from openid.store.memstore import MemoryStore
from openid.message import (OPENID1_URL_LIMIT, IDENTIFIER_SELECT) from openid.message import OPENID1_URL_LIMIT, IDENTIFIER_SELECT
from django_openid_auth import teams from django_openid_auth import teams
from django_openid_auth.models import UserOpenID from django_openid_auth.models import UserOpenID
from django_openid_auth.views import ( from django_openid_auth.views import (
sanitise_redirect_url, sanitise_redirect_url,
make_consumer, make_consumer,
login_begin,
login_complete,
parse_openid_response,
) )
from django_openid_auth.auth import OpenIDBackend from django_openid_auth.auth import OpenIDBackend
from django_openid_auth.signals import openid_login_complete from django_openid_auth.signals import openid_login_complete
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment