switched last bits of openid dependency to internal paths

3 files changed, 11 insertions, 11 deletions

diff --git a/askbot/deps/django_authopenid/forms.py b/askbot/deps/django_authopenid/forms.py
index c7022b5d..d8e03137 100644
--- a/askbot/deps/django_authopenid/forms.py
+++ b/askbot/deps/django_authopenid/forms.py
@@ -46,7 +46,7 @@ from askbot.utils.forms import NextUrlField, UserNameField, UserEmailField, SetP
 
 # needed for some linux distributions like debian
 try:
-    from openid.yadis import xri
+    from askbot.deps.openid.yadis import xri
 except ImportError:
     from yadis import xri
     
diff --git a/askbot/deps/django_authopenid/util.py b/askbot/deps/django_authopenid/util.py
index 8c4cdaa7..73b0ed77 100644
--- a/askbot/deps/django_authopenid/util.py
+++ b/askbot/deps/django_authopenid/util.py
@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 import urlparse
 import urllib
-from openid.store.interface import OpenIDStore
-from openid.association import Association as OIDAssociation
-from openid.extensions import sreg
-import openid.store
+from askbot.deps.openid.store.interface import OpenIDStore
+from askbot.deps.openid.association import Association as OIDAssociation
+from askbot.deps.openid.extensions import sreg
+from askbot.deps.openid import store as openid_store
 import oauth2 as oauth
 
 from django.db.models.query import Q
@@ -23,7 +23,7 @@ from askbot.conf import settings as askbot_settings
 
 # needed for some linux distributions like debian
 try:
-    from openid.yadis import xri
+    from askbot.deps.openid.yadis import xri
 except:
     from yadis import xri
 
@@ -100,7 +100,7 @@ class DjangoOpenIDStore(OpenIDStore):
         return assocs_exist
 
     def useNonce(self, server_url, timestamp, salt):
-        if abs(timestamp - time.time()) > openid.store.nonce.SKEW:
+        if abs(timestamp - time.time()) > openid_store.nonce.SKEW:
             return False
         
         query = [
diff --git a/askbot/deps/django_authopenid/views.py b/askbot/deps/django_authopenid/views.py
index fb4aae82..844005b8 100644
--- a/askbot/deps/django_authopenid/views.py
+++ b/askbot/deps/django_authopenid/views.py
@@ -52,13 +52,13 @@ from django.views.defaults import server_error
 
 from askbot.skins.loaders import ENV
 
-from openid.consumer.consumer import Consumer, \
+from askbot.deps.openid.consumer.consumer import Consumer, \
     SUCCESS, CANCEL, FAILURE, SETUP_NEEDED
-from openid.consumer.discover import DiscoveryFailure
-from openid.extensions import sreg
+from askbot.deps.openid.consumer.discover import DiscoveryFailure
+from askbot.deps.openid.extensions import sreg
 # needed for some linux distributions like debian
 try:
-    from openid.yadis import xri
+    from askbot.deps.openid.yadis import xri
 except ImportError:
     from yadis import xri