hardcoded the included openid library to import from itself, to exclude a possibility of the library mixup

70 files changed, 210 insertions, 210 deletions

diff --git a/askbot/__init__.py b/askbot/__init__.py
index fe6623ee..ed9d6980 100644
--- a/askbot/__init__.py
+++ b/askbot/__init__.py
@@ -22,7 +22,7 @@ def get_version():
     """returns version of the askbot app
     this version is meaningful for pypi only
     """
-    return '0.6.21'
+    return '0.6.24'
 
 #todo: maybe send_mail functions belong to models
 #or the future API
diff --git a/askbot/deps/django_authopenid/util.py b/askbot/deps/django_authopenid/util.py
index 716cc5dd..8c4cdaa7 100644
--- a/askbot/deps/django_authopenid/util.py
+++ b/askbot/deps/django_authopenid/util.py
@@ -350,7 +350,7 @@ def get_minor_login_providers():
         'type': 'openid-username',
         'extra_token_name': _('ClaimID user name'),
         'icon_media_path': '/jquery-openid/images/claimid-0.png',
-        'openid_endpoint': 'http://%(username)s.livejournal.com'
+        'openid_endpoint': 'http://claimid.com/%(username)s/'
     }
     data['vidoop'] = {
         'name': 'vidoop',
diff --git a/askbot/deps/openid/association.py b/askbot/deps/openid/association.py
index 5be534b9..a5fafffc 100644
--- a/askbot/deps/openid/association.py
+++ b/askbot/deps/openid/association.py
@@ -34,10 +34,10 @@ __all__ = [
 
 import time
 
-from openid import cryptutil
-from openid import kvform
-from openid import oidutil
-from openid.message import OPENID_NS
+from askbot.deps.openid import cryptutil
+from askbot.deps.openid import kvform
+from askbot.deps.openid import oidutil
+from askbot.deps.openid.message import OPENID_NS
 
 all_association_types = [
     'HMAC-SHA1',
diff --git a/askbot/deps/openid/consumer/consumer.py b/askbot/deps/openid/consumer/consumer.py
index 52057494..64a2278c 100644
--- a/askbot/deps/openid/consumer/consumer.py
+++ b/askbot/deps/openid/consumer/consumer.py
@@ -191,20 +191,20 @@ import cgi
 import copy
 from urlparse import urlparse, urldefrag
 
-from openid import fetchers
+from askbot.deps.openid import fetchers
 
-from openid.consumer.discover import discover, OpenIDServiceEndpoint, \
+from askbot.deps.openid.consumer.discover import discover, OpenIDServiceEndpoint, \
      DiscoveryFailure, OPENID_1_0_TYPE, OPENID_1_1_TYPE, OPENID_2_0_TYPE
-from openid.message import Message, OPENID_NS, OPENID2_NS, OPENID1_NS, \
+from askbot.deps.openid.message import Message, OPENID_NS, OPENID2_NS, OPENID1_NS, \
      IDENTIFIER_SELECT, no_default, BARE_NS
-from openid import cryptutil
-from openid import oidutil
-from openid.association import Association, default_negotiator, \
+from askbot.deps.openid import cryptutil
+from askbot.deps.openid import oidutil
+from askbot.deps.openid.association import Association, default_negotiator, \
      SessionNegotiator
-from openid.dh import DiffieHellman
-from openid.store.nonce import mkNonce, split as splitNonce
-from openid.yadis.manager import Discovery
-from openid import urinorm
+from askbot.deps.openid.dh import DiffieHellman
+from askbot.deps.openid.store.nonce import mkNonce, split as splitNonce
+from askbot.deps.openid.yadis.manager import Discovery
+from askbot.deps.openid import urinorm
 
 
 __all__ = ['AuthRequest', 'Consumer', 'SuccessResponse',
diff --git a/askbot/deps/openid/consumer/discover.py b/askbot/deps/openid/consumer/discover.py
index 2c86dda8..d7a0c2a3 100644
--- a/askbot/deps/openid/consumer/discover.py
+++ b/askbot/deps/openid/consumer/discover.py
@@ -15,17 +15,17 @@ __all__ = [
 
 import urlparse
 
-from openid import oidutil, fetchers, urinorm
+from askbot.deps.openid import oidutil, fetchers, urinorm
 
-from openid import yadis
-from openid.yadis.etxrd import nsTag, XRDSError, XRD_NS_2_0
-from openid.yadis.services import applyFilter as extractServices
-from openid.yadis.discover import discover as yadisDiscover
-from openid.yadis.discover import DiscoveryFailure
-from openid.yadis import xrires, filters
-from openid.yadis import xri
+from askbot.deps.openid import yadis
+from askbot.deps.openid.yadis.etxrd import nsTag, XRDSError, XRD_NS_2_0
+from askbot.deps.openid.yadis.services import applyFilter as extractServices
+from askbot.deps.openid.yadis.discover import discover as yadisDiscover
+from askbot.deps.openid.yadis.discover import DiscoveryFailure
+from askbot.deps.openid.yadis import xrires, filters
+from askbot.deps.openid.yadis import xri
 
-from openid.consumer import html_parse
+from askbot.deps.openid.consumer import html_parse
 
 OPENID_1_0_NS = 'http://openid.net/xmlns/1.0'
 OPENID_IDP_2_0_TYPE = 'http://specs.openid.net/auth/2.0/server'
@@ -33,8 +33,8 @@ OPENID_2_0_TYPE = 'http://specs.openid.net/auth/2.0/signon'
 OPENID_1_1_TYPE = 'http://openid.net/signon/1.1'
 OPENID_1_0_TYPE = 'http://openid.net/signon/1.0'
 
-from openid.message import OPENID1_NS as OPENID_1_0_MESSAGE_NS
-from openid.message import OPENID2_NS as OPENID_2_0_MESSAGE_NS
+from askbot.deps.openid.message import OPENID1_NS as OPENID_1_0_MESSAGE_NS
+from askbot.deps.openid.message import OPENID2_NS as OPENID_2_0_MESSAGE_NS
 
 class OpenIDServiceEndpoint(object):
     """Object representing an OpenID service endpoint.
diff --git a/askbot/deps/openid/cryptutil.py b/askbot/deps/openid/cryptutil.py
index 3123be64..8d4bef8a 100644
--- a/askbot/deps/openid/cryptutil.py
+++ b/askbot/deps/openid/cryptutil.py
@@ -30,7 +30,7 @@ import hmac
 import os
 import random
 
-from openid.oidutil import toBase64, fromBase64
+from askbot.deps.openid.oidutil import toBase64, fromBase64
 
 try:
     import hashlib
diff --git a/askbot/deps/openid/dh.py b/askbot/deps/openid/dh.py
index bb83bbe8..7dbb758d 100644
--- a/askbot/deps/openid/dh.py
+++ b/askbot/deps/openid/dh.py
@@ -1,5 +1,5 @@
-from openid import cryptutil
-from openid import oidutil
+from askbot.deps.openid import cryptutil
+from askbot.deps.openid import oidutil
 
 def strxor(x, y):
     if len(x) != len(y):
diff --git a/askbot/deps/openid/extension.py b/askbot/deps/openid/extension.py
index d48bbb2f..d6ec0044 100644
--- a/askbot/deps/openid/extension.py
+++ b/askbot/deps/openid/extension.py
@@ -1,4 +1,4 @@
-from openid import message as message_module
+from askbot.deps.openid import message as message_module
 
 class Extension(object):
     """An interface for OpenID extensions.
diff --git a/askbot/deps/openid/extensions/__init__.py b/askbot/deps/openid/extensions/__init__.py
index 710b2002..e27aa75f 100644
--- a/askbot/deps/openid/extensions/__init__.py
+++ b/askbot/deps/openid/extensions/__init__.py
@@ -2,4 +2,4 @@
 
 __all__ = ['ax', 'pape', 'sreg']
 
-from openid.extensions.draft import pape5 as pape
+from askbot.deps.openid.extensions.draft import pape5 as pape
diff --git a/askbot/deps/openid/extensions/ax.py b/askbot/deps/openid/extensions/ax.py
index 65d0a512..9ba89b93 100644
--- a/askbot/deps/openid/extensions/ax.py
+++ b/askbot/deps/openid/extensions/ax.py
@@ -12,9 +12,9 @@ __all__ = [
     'StoreResponse',
     ]
 
-from openid import extension
-from openid.server.trustroot import TrustRoot
-from openid.message import NamespaceMap, OPENID_NS
+from askbot.deps.openid import extension
+from askbot.deps.openid.server.trustroot import TrustRoot
+from askbot.deps.openid.message import NamespaceMap, OPENID_NS
 
 # Use this as the 'count' value for an attribute in a FetchRequest to
 # ask for as many values as the OP can provide.
diff --git a/askbot/deps/openid/extensions/draft/pape2.py b/askbot/deps/openid/extensions/draft/pape2.py
index e7320465..13e4acd2 100644
--- a/askbot/deps/openid/extensions/draft/pape2.py
+++ b/askbot/deps/openid/extensions/draft/pape2.py
@@ -15,7 +15,7 @@ __all__ = [
     'AUTH_MULTI_FACTOR_PHYSICAL',
     ]
 
-from openid.extension import Extension
+from askbot.deps.openid.extension import Extension
 import re
 
 ns_uri = "http://specs.openid.net/extensions/pape/1.0"
diff --git a/askbot/deps/openid/extensions/draft/pape5.py b/askbot/deps/openid/extensions/draft/pape5.py
index 3bd1ffc0..4ec6f3ab 100644
--- a/askbot/deps/openid/extensions/draft/pape5.py
+++ b/askbot/deps/openid/extensions/draft/pape5.py
@@ -17,7 +17,7 @@ __all__ = [
     'LEVELS_JISA',
     ]
 
-from openid.extension import Extension
+from askbot.deps.openid.extension import Extension
 import warnings
 import re
 
diff --git a/askbot/deps/openid/extensions/sreg.py b/askbot/deps/openid/extensions/sreg.py
index 76909d22..7e89af47 100644
--- a/askbot/deps/openid/extensions/sreg.py
+++ b/askbot/deps/openid/extensions/sreg.py
@@ -35,10 +35,10 @@ OpenID providers.
     namespace and XRD Type value
 """
 
-from openid.message import registerNamespaceAlias, \
+from askbot.deps.openid.message import registerNamespaceAlias, \
      NamespaceAliasRegistrationError
-from openid.extension import Extension
-from openid import oidutil
+from askbot.deps.openid.extension import Extension
+from askbot.deps.openid import oidutil
 
 try:
     basestring #pylint:disable-msg=W0104
diff --git a/askbot/deps/openid/fetchers.py b/askbot/deps/openid/fetchers.py
index 944e2157..11ab47fb 100644
--- a/askbot/deps/openid/fetchers.py
+++ b/askbot/deps/openid/fetchers.py
@@ -12,8 +12,8 @@ import time
 import cStringIO
 import sys
 
-import openid
-import openid.urinorm
+from askbot.deps import openid
+import askbot.deps.openid.urinorm
 
 # Try to import httplib2 for caching support
 # http://bitworking.org/projects/httplib2/
@@ -324,7 +324,7 @@ class CurlHTTPFetcher(HTTPFetcher):
                 c.setopt(pycurl.WRITEFUNCTION, write_data)
                 c.setopt(pycurl.HEADERFUNCTION, response_header_data.write)
                 c.setopt(pycurl.TIMEOUT, off)
-                c.setopt(pycurl.URL, openid.urinorm.urinorm(url))
+                c.setopt(pycurl.URL, askbot.deps.openid.urinorm.urinorm(url))
 
                 c.perform()
 
diff --git a/askbot/deps/openid/kvform.py b/askbot/deps/openid/kvform.py
index d875f56c..81d429ea 100644
--- a/askbot/deps/openid/kvform.py
+++ b/askbot/deps/openid/kvform.py
@@ -1,6 +1,6 @@
 __all__ = ['seqToKV', 'kvToSeq', 'dictToKV', 'kvToDict']
 
-from openid import oidutil
+from askbot.deps.openid import oidutil
 
 import types
 
diff --git a/askbot/deps/openid/message.py b/askbot/deps/openid/message.py
index 472e5175..1ba72f06 100644
--- a/askbot/deps/openid/message.py
+++ b/askbot/deps/openid/message.py
@@ -8,8 +8,8 @@ import copy
 import warnings
 import urllib
 
-from openid import oidutil
-from openid import kvform
+from askbot.deps.openid import oidutil
+from askbot.deps.openid import kvform
 try:
     ElementTree = oidutil.importElementTree()
 except ImportError:
diff --git a/askbot/deps/openid/oidutil.py b/askbot/deps/openid/oidutil.py
index 5246d160..593fdcf9 100644
--- a/askbot/deps/openid/oidutil.py
+++ b/askbot/deps/openid/oidutil.py
@@ -87,7 +87,7 @@ def log(message, level=0):
 
     To install your own logging hook::
 
-      from openid import oidutil
+      from askbot.deps.openid import oidutil
 
       def myLoggingFunction(message, level):
           ...
diff --git a/askbot/deps/openid/server/server.py b/askbot/deps/openid/server/server.py
index f653b047..6d94249b 100644
--- a/askbot/deps/openid/server/server.py
+++ b/askbot/deps/openid/server/server.py
@@ -119,16 +119,16 @@ From 1.1 to 2.0
 import time, warnings
 from copy import deepcopy
 
-from openid import cryptutil
-from openid import oidutil
-from openid import kvform
-from openid.dh import DiffieHellman
-from openid.store.nonce import mkNonce
-from openid.server.trustroot import TrustRoot, verifyReturnTo
-from openid.association import Association, default_negotiator, getSecretSize
-from openid.message import Message, InvalidOpenIDNamespace, \
+from askbot.deps.openid import cryptutil
+from askbot.deps.openid import oidutil
+from askbot.deps.openid import kvform
+from askbot.deps.openid.dh import DiffieHellman
+from askbot.deps.openid.store.nonce import mkNonce
+from askbot.deps.openid.server.trustroot import TrustRoot, verifyReturnTo
+from askbot.deps.openid.association import Association, default_negotiator, getSecretSize
+from askbot.deps.openid.message import Message, InvalidOpenIDNamespace, \
      OPENID_NS, OPENID2_NS, IDENTIFIER_SELECT, OPENID1_URL_LIMIT
-from openid.urinorm import urinorm
+from askbot.deps.openid.urinorm import urinorm
 
 HTTP_OK = 200
 HTTP_REDIRECT = 302
diff --git a/askbot/deps/openid/server/trustroot.py b/askbot/deps/openid/server/trustroot.py
index 84a100e9..f78d2992 100644
--- a/askbot/deps/openid/server/trustroot.py
+++ b/askbot/deps/openid/server/trustroot.py
@@ -17,9 +17,9 @@ __all__ = [
     'verifyReturnTo',
     ]
 
-from openid import oidutil
-from openid import urinorm
-from openid.yadis import services
+from askbot.deps.openid import oidutil
+from askbot.deps.openid import urinorm
+from askbot.deps.openid.yadis import services
 
 from urlparse import urlparse, urlunparse
 import re
diff --git a/askbot/deps/openid/sreg.py b/askbot/deps/openid/sreg.py
index d665a5d0..a002b128 100644
--- a/askbot/deps/openid/sreg.py
+++ b/askbot/deps/openid/sreg.py
@@ -4,4 +4,4 @@ import warnings
 warnings.warn("openid.sreg has moved to openid.extensions.sreg",
               DeprecationWarning)
 
-from openid.extensions.sreg import *
+from askbot.deps.openid.extensions.sreg import *
diff --git a/askbot/deps/openid/store/filestore.py b/askbot/deps/openid/store/filestore.py
index ced3cee4..47de4964 100644
--- a/askbot/deps/openid/store/filestore.py
+++ b/askbot/deps/openid/store/filestore.py
@@ -33,10 +33,10 @@ except ImportError:
 
         raise RuntimeError('Failed to get temp file after 5 attempts')
 
-from openid.association import Association
-from openid.store.interface import OpenIDStore
-from openid.store import nonce
-from openid import cryptutil, oidutil
+from askbot.deps.openid.association import Association
+from askbot.deps.openid.store.interface import OpenIDStore
+from askbot.deps.openid.store import nonce
+from askbot.deps.openid import cryptutil, oidutil
 
 _filename_allowed = string.ascii_letters + string.digits + '.'
 try:
diff --git a/askbot/deps/openid/store/memstore.py b/askbot/deps/openid/store/memstore.py
index e2748fb2..a088c0d0 100644
--- a/askbot/deps/openid/store/memstore.py
+++ b/askbot/deps/openid/store/memstore.py
@@ -1,6 +1,6 @@
 """A simple store using only in-process memory."""
 
-from openid.store import nonce
+from askbot.deps.openid.store import nonce
 
 import copy
 import time
diff --git a/askbot/deps/openid/store/nonce.py b/askbot/deps/openid/store/nonce.py
index e9337a8a..7847f9fa 100644
--- a/askbot/deps/openid/store/nonce.py
+++ b/askbot/deps/openid/store/nonce.py
@@ -4,7 +4,7 @@ __all__ = [
     'checkTimestamp',
     ]
 
-from openid import cryptutil
+from askbot.deps.openid import cryptutil
 from time import strptime, strftime, gmtime, time
 from calendar import timegm
 import string
diff --git a/askbot/deps/openid/store/sqlstore.py b/askbot/deps/openid/store/sqlstore.py
index 58c4337e..cceebd58 100644
--- a/askbot/deps/openid/store/sqlstore.py
+++ b/askbot/deps/openid/store/sqlstore.py
@@ -4,14 +4,14 @@ various SQL databases to back them.
 
 Example of how to initialize a store database::
 
-    python -c 'from openid.store import sqlstore; import pysqlite2.dbapi2; sqlstore.SQLiteStore(pysqlite2.dbapi2.connect("cstore.db")).createTables()'
+    python -c 'from askbot.deps.openid.store import sqlstore; import pysqlite2.dbapi2; sqlstore.SQLiteStore(pysqlite2.dbapi2.connect("cstore.db")).createTables()'
 """
 import re
 import time
 
-from openid.association import Association
-from openid.store.interface import OpenIDStore
-from openid.store import nonce
+from askbot.deps.openid.association import Association
+from askbot.deps.openid.store.interface import OpenIDStore
+from askbot.deps.openid.store import nonce
 
 def _inTxn(func):
     def wrapped(self, *args, **kwargs):
diff --git a/askbot/deps/openid/test/cryptutil.py b/askbot/deps/openid/test/cryptutil.py
index 753596cb..62d59ce2 100644
--- a/askbot/deps/openid/test/cryptutil.py
+++ b/askbot/deps/openid/test/cryptutil.py
@@ -2,7 +2,7 @@ import sys
 import random
 import os.path
 
-from openid import cryptutil
+from askbot.deps.openid import cryptutil
 
 # Most of the purpose of this test is to make sure that cryptutil can
 # find a good source of randomness on this machine.
diff --git a/askbot/deps/openid/test/dh.py b/askbot/deps/openid/test/dh.py
index 16b8d560..c4478d15 100644
--- a/askbot/deps/openid/test/dh.py
+++ b/askbot/deps/openid/test/dh.py
@@ -1,5 +1,5 @@
 import os.path
-from openid.dh import DiffieHellman, strxor
+from askbot.deps.openid.dh import DiffieHellman, strxor
 
 def test_strxor():
     NUL = '\x00'
diff --git a/askbot/deps/openid/test/discoverdata.py b/askbot/deps/openid/test/discoverdata.py
index 78b18f73..f618290f 100644
--- a/askbot/deps/openid/test/discoverdata.py
+++ b/askbot/deps/openid/test/discoverdata.py
@@ -2,8 +2,8 @@
 import urlparse
 import os.path
 
-from openid.yadis.discover import DiscoveryResult, DiscoveryFailure
-from openid.yadis.constants import YADIS_HEADER_NAME
+from askbot.deps.openid.yadis.discover import DiscoveryResult, DiscoveryFailure
+from askbot.deps.openid.yadis.constants import YADIS_HEADER_NAME
 
 tests_dir = os.path.dirname(__file__)
 data_path = os.path.join(tests_dir, 'data')
diff --git a/askbot/deps/openid/test/kvform.py b/askbot/deps/openid/test/kvform.py
index a83a62be..e63d4178 100644
--- a/askbot/deps/openid/test/kvform.py
+++ b/askbot/deps/openid/test/kvform.py
@@ -1,5 +1,5 @@
-from openid import kvform
-from openid import oidutil
+from askbot.deps.openid import kvform
+from askbot.deps.openid import oidutil
 import unittest
 
 class KVBaseTest(unittest.TestCase):
diff --git a/askbot/deps/openid/test/linkparse.py b/askbot/deps/openid/test/linkparse.py
index 04475b7a..28cab023 100644
--- a/askbot/deps/openid/test/linkparse.py
+++ b/askbot/deps/openid/test/linkparse.py
@@ -1,4 +1,4 @@
-from openid.consumer.html_parse import parseLinkAttrs
+from askbot.deps.openid.consumer.html_parse import parseLinkAttrs
 import os.path
 import codecs
 import unittest
diff --git a/askbot/deps/openid/test/oidutil.py b/askbot/deps/openid/test/oidutil.py
index fbeadf25..ec84b1b6 100644
--- a/askbot/deps/openid/test/oidutil.py
+++ b/askbot/deps/openid/test/oidutil.py
@@ -2,7 +2,7 @@ import unittest
 import codecs
 import string
 import random
-from openid import oidutil
+from askbot.deps.openid import oidutil
 
 def test_base64():
     allowed_s = string.ascii_letters + string.digits + '+/='
diff --git a/askbot/deps/openid/test/storetest.py b/askbot/deps/openid/test/storetest.py
index e428c36d..0aa834e0 100644
--- a/askbot/deps/openid/test/storetest.py
+++ b/askbot/deps/openid/test/storetest.py
@@ -1,6 +1,6 @@
-from openid.association import Association
-from openid.cryptutil import randomString
-from openid.store.nonce import mkNonce, split
+from askbot.deps.openid.association import Association
+from askbot.deps.openid.cryptutil import randomString
+from askbot.deps.openid.store.nonce import mkNonce, split
 
 import unittest
 import string
@@ -194,7 +194,7 @@ def testStore(store):
     old_nonce2 = mkNonce(now - 10000)
     recent_nonce = mkNonce(now - 600)
 
-    from openid.store import nonce as nonceModule
+    from askbot.deps.openid.store import nonce as nonceModule
     orig_skew = nonceModule.SKEW
     try:
         nonceModule.SKEW = 0
@@ -221,7 +221,7 @@ def testStore(store):
 
 
 def test_filestore():
-    from openid.store import filestore
+    from askbot.deps.openid.store import filestore
     import tempfile
     import shutil
     try:
@@ -241,7 +241,7 @@ def test_filestore():
         shutil.rmtree(temp_dir)
 
 def test_sqlite():
-    from openid.store import sqlstore
+    from askbot.deps.openid.store import sqlstore
     try:
         from pysqlite2 import dbapi2 as sqlite
     except ImportError:
@@ -253,7 +253,7 @@ def test_sqlite():
         testStore(store)
 
 def test_mysql():
-    from openid.store import sqlstore
+    from askbot.deps.openid.store import sqlstore
     try:
         import MySQLdb
     except ImportError:
@@ -318,7 +318,7 @@ def test_postgresql():
 
     - To the 'template1' database once more, to drop the test database
     """
-    from openid.store import sqlstore
+    from askbot.deps.openid.store import sqlstore
     try:
         import psycopg
     except ImportError:
@@ -370,7 +370,7 @@ def test_postgresql():
         conn_remove.close()
 
 def test_memstore():
-    from openid.store import memstore
+    from askbot.deps.openid.store import memstore
     testStore(memstore.MemoryStore())
 
 test_functions = [
diff --git a/askbot/deps/openid/test/support.py b/askbot/deps/openid/test/support.py
index dbf8881e..1573edbd 100644
--- a/askbot/deps/openid/test/support.py
+++ b/askbot/deps/openid/test/support.py
@@ -1,5 +1,5 @@
-from openid import message
-from openid import oidutil
+from askbot.deps.openid import message
+from askbot.deps.openid import oidutil
 
 class OpenIDTestMixin(object):
     def failUnlessOpenIDValueEquals(self, msg, key, expected, ns=None):
diff --git a/askbot/deps/openid/test/test_accept.py b/askbot/deps/openid/test/test_accept.py
index 3cc36025..0bb491eb 100644
--- a/askbot/deps/openid/test/test_accept.py
+++ b/askbot/deps/openid/test/test_accept.py
@@ -1,6 +1,6 @@
 import unittest
 import os.path
-from openid.yadis import accept
+from askbot.deps.openid.yadis import accept
 
 def getTestData():
     """Read the test data off of disk
diff --git a/askbot/deps/openid/test/test_association.py b/askbot/deps/openid/test/test_association.py
index 6404a008..486be87b 100644
--- a/askbot/deps/openid/test/test_association.py
+++ b/askbot/deps/openid/test/test_association.py
@@ -1,11 +1,11 @@
-from openid.test import datadriven
+from askbot.deps.openid.test import datadriven
 
 import unittest
 
-from openid.message import Message, BARE_NS, OPENID_NS, OPENID2_NS
-from openid import association
+from askbot.deps.openid.message import Message, BARE_NS, OPENID_NS, OPENID2_NS
+from askbot.deps.openid import association
 import time
-from openid import cryptutil
+from askbot.deps.openid import cryptutil
 import warnings
 
 class AssociationSerializationTest(unittest.TestCase):
@@ -22,17 +22,17 @@ class AssociationSerializationTest(unittest.TestCase):
         self.failUnlessEqual(assoc.lifetime, assoc2.lifetime)
         self.failUnlessEqual(assoc.assoc_type, assoc2.assoc_type)
 
-from openid.server.server import \
+from askbot.deps.openid.server.server import \
      DiffieHellmanSHA1ServerSession, \
      DiffieHellmanSHA256ServerSession, \
      PlainTextServerSession
 
-from openid.consumer.consumer import \
+from askbot.deps.openid.consumer.consumer import \
      DiffieHellmanSHA1ConsumerSession, \
      DiffieHellmanSHA256ConsumerSession, \
      PlainTextConsumerSession
 
-from openid.dh import DiffieHellman
+from askbot.deps.openid.dh import DiffieHellman
 
 def createNonstandardConsumerDH():
     nonstandard_dh = DiffieHellman(1315291, 2)
diff --git a/askbot/deps/openid/test/test_association_response.py b/askbot/deps/openid/test/test_association_response.py
index cf9d0147..34b2145f 100644
--- a/askbot/deps/openid/test/test_association_response.py
+++ b/askbot/deps/openid/test/test_association_response.py
@@ -3,14 +3,14 @@
 This duplicates some things that are covered by test_consumer, but
 this works for now.
 """
-from openid import oidutil
-from openid.test.test_consumer import CatchLogs
-from openid.message import Message, OPENID2_NS, OPENID_NS, no_default
-from openid.server.server import DiffieHellmanSHA1ServerSession
-from openid.consumer.consumer import GenericConsumer, \
+from askbot.deps.openid import oidutil
+from askbot.deps.openid.test.test_consumer import CatchLogs
+from askbot.deps.openid.message import Message, OPENID2_NS, OPENID_NS, no_default
+from askbot.deps.openid.server.server import DiffieHellmanSHA1ServerSession
+from askbot.deps.openid.consumer.consumer import GenericConsumer, \
      DiffieHellmanSHA1ConsumerSession, ProtocolError
-from openid.consumer.discover import OpenIDServiceEndpoint, OPENID_1_1_TYPE, OPENID_2_0_TYPE
-from openid.store import memstore
+from askbot.deps.openid.consumer.discover import OpenIDServiceEndpoint, OPENID_1_1_TYPE, OPENID_2_0_TYPE
+from askbot.deps.openid.store import memstore
 import unittest
 
 # Some values we can use for convenience (see mkAssocResponse)
diff --git a/askbot/deps/openid/test/test_auth_request.py b/askbot/deps/openid/test/test_auth_request.py
index d9e72332..412b77a4 100644
--- a/askbot/deps/openid/test/test_auth_request.py
+++ b/askbot/deps/openid/test/test_auth_request.py
@@ -1,9 +1,9 @@
 import cgi
 import unittest
 
-from openid.consumer import consumer
-from openid import message
-from openid.test import support
+from askbot.deps.openid.consumer import consumer
+from askbot.deps.openid import message
+from askbot.deps.openid.test import support
 
 class DummyEndpoint(object):
     preferred_namespace = None
diff --git a/askbot/deps/openid/test/test_ax.py b/askbot/deps/openid/test/test_ax.py
index 9c349a78..6d4aeac5 100644
--- a/askbot/deps/openid/test/test_ax.py
+++ b/askbot/deps/openid/test/test_ax.py
@@ -2,9 +2,9 @@
 """
 
 import unittest
-from openid.extensions import ax
-from openid.message import NamespaceMap, Message, OPENID2_NS
-from openid.consumer.consumer import SuccessResponse
+from askbot.deps.openid.extensions import ax
+from askbot.deps.openid.message import NamespaceMap, Message, OPENID2_NS
+from askbot.deps.openid.consumer.consumer import SuccessResponse
 
 class BogusAXMessage(ax.AXMessage):
     mode = 'bogus'
diff --git a/askbot/deps/openid/test/test_consumer.py b/askbot/deps/openid/test/test_consumer.py
index 33a75647..e0bf48c5 100644
--- a/askbot/deps/openid/test/test_consumer.py
+++ b/askbot/deps/openid/test/test_consumer.py
@@ -3,28 +3,28 @@ import cgi
 import time
 import warnings
 
-from openid.message import Message, OPENID_NS, OPENID2_NS, IDENTIFIER_SELECT, \
+from askbot.deps.openid.message import Message, OPENID_NS, OPENID2_NS, IDENTIFIER_SELECT, \
      OPENID1_NS, BARE_NS
-from openid import cryptutil, dh, oidutil, kvform
-from openid.store.nonce import mkNonce, split as splitNonce
-from openid.consumer.discover import OpenIDServiceEndpoint, OPENID_2_0_TYPE, \
+from askbot.deps.openid import cryptutil, dh, oidutil, kvform
+from askbot.deps.openid.store.nonce import mkNonce, split as splitNonce
+from askbot.deps.openid.consumer.discover import OpenIDServiceEndpoint, OPENID_2_0_TYPE, \
      OPENID_1_1_TYPE
-from openid.consumer.consumer import \
+from askbot.deps.openid.consumer.consumer import \
      AuthRequest, GenericConsumer, SUCCESS, FAILURE, CANCEL, SETUP_NEEDED, \
      SuccessResponse, FailureResponse, SetupNeededResponse, CancelResponse, \
      DiffieHellmanSHA1ConsumerSession, Consumer, PlainTextConsumerSession, \
      SetupNeededError, DiffieHellmanSHA256ConsumerSession, ServerError, \
      ProtocolError, _httpResponseToMessage
-from openid import association
-from openid.server.server import \
+from askbot.deps.openid import association
+from askbot.deps.openid.server.server import \
      PlainTextServerSession, DiffieHellmanSHA1ServerSession
-from openid.yadis.manager import Discovery
-from openid.yadis.discover import DiscoveryFailure
-from openid.dh import DiffieHellman
+from askbot.deps.openid.yadis.manager import Discovery
+from askbot.deps.openid.yadis.discover import DiscoveryFailure
+from askbot.deps.openid.dh import DiffieHellman
 
-from openid.fetchers import HTTPResponse, HTTPFetchingError
-from openid import fetchers
-from openid.store import memstore
+from askbot.deps.openid.fetchers import HTTPResponse, HTTPFetchingError
+from askbot.deps.openid import fetchers
+from askbot.deps.openid.store import memstore
 
 from support import CatchLogs
 
@@ -1459,13 +1459,13 @@ class ConsumerTest(unittest.TestCase):
 
             getNextService = dummy_getNextService
 
-        import openid.consumer.consumer
-        old_discovery = openid.consumer.consumer.Discovery
+        from askbot.deps.openid.consumer import consumer
+        old_discovery = consumer.Discovery
         try:
-            openid.consumer.consumer.Discovery = DummyDisco
+            consumer.Discovery = DummyDisco
             callable()
         finally:
-            openid.consumer.consumer.Discovery = old_discovery
+            consumer.Discovery = old_discovery
 
     def test_beginHTTPError(self):
         """Make sure that the discovery HTTP failure case behaves properly
@@ -2035,7 +2035,7 @@ class TestDiscoverAndVerify(unittest.TestCase):
             'http://claimed.id/', [self.to_match])
         self.failUnlessEqual(matching_endpoint, result)
 
-from openid.extension import Extension
+from askbot.deps.openid.extension import Extension
 class SillyExtension(Extension):
     ns_uri = 'http://silly.example.com/'
     ns_alias = 'silly'
@@ -2059,7 +2059,7 @@ class TestKVPost(unittest.TestCase):
         self.server_url = 'http://unittest/%s' % (self.id(),)
 
     def test_200(self):
-        from openid.fetchers import HTTPResponse
+        from askbot.deps.openid.fetchers import HTTPResponse
         response = HTTPResponse()
         response.status = 200
         response.body = "foo:bar\nbaz:quux\n"
diff --git a/askbot/deps/openid/test/test_discover.py b/askbot/deps/openid/test/test_discover.py
index fca93631..e985b601 100644
--- a/askbot/deps/openid/test/test_discover.py
+++ b/askbot/deps/openid/test/test_discover.py
@@ -2,14 +2,14 @@ import sys
 import unittest
 import datadriven
 import os.path
-from openid import fetchers
-from openid.fetchers import HTTPResponse
-from openid.yadis.discover import DiscoveryFailure
-from openid.consumer import discover
-from openid.yadis import xrires
-from openid.yadis.xri import XRI
+from askbot.deps.openid import fetchers
+from askbot.deps.openid.fetchers import HTTPResponse
+from askbot.deps.openid.yadis.discover import DiscoveryFailure
+from askbot.deps.openid.consumer import discover
+from askbot.deps.openid.yadis import xrires
+from askbot.deps.openid.yadis.xri import XRI
 from urlparse import urlsplit
-from openid import message
+from askbot.deps.openid import message
 
 ### Tests for conditions that trigger DiscoveryFailure
 
diff --git a/askbot/deps/openid/test/test_etxrd.py b/askbot/deps/openid/test/test_etxrd.py
index 51cd27f6..653ae1fb 100644
--- a/askbot/deps/openid/test/test_etxrd.py
+++ b/askbot/deps/openid/test/test_etxrd.py
@@ -1,5 +1,5 @@
 import unittest
-from openid.yadis import services, etxrd, xri
+from askbot.deps.openid.yadis import services, etxrd, xri
 import os.path
 
 def datapath(filename):
diff --git a/askbot/deps/openid/test/test_examples.py b/askbot/deps/openid/test/test_examples.py
index 92269d05..d2360354 100644
--- a/askbot/deps/openid/test/test_examples.py
+++ b/askbot/deps/openid/test/test_examples.py
@@ -6,9 +6,9 @@ from cStringIO import StringIO
 
 import twill.commands, twill.parse, twill.unit
 
-from openid.consumer.discover import \
+from askbot.deps.openid.consumer.discover import \
      OpenIDServiceEndpoint, OPENID_1_1_TYPE
-from openid.consumer.consumer import AuthRequest
+from askbot.deps.openid.consumer.consumer import AuthRequest
 
 class TwillTest(twill.unit.TestInfo):
     """Variant of twill.unit.TestInfo that runs a function as a test script,
diff --git a/askbot/deps/openid/test/test_extension.py b/askbot/deps/openid/test/test_extension.py
index 7dadbd0b..297adfc3 100644
--- a/askbot/deps/openid/test/test_extension.py
+++ b/askbot/deps/openid/test/test_extension.py
@@ -1,5 +1,5 @@
-from openid import extension
-from openid import message
+from askbot.deps.openid import extension
+from askbot.deps.openid import message
 
 import unittest
 
diff --git a/askbot/deps/openid/test/test_fetchers.py b/askbot/deps/openid/test/test_fetchers.py
index da1eea84..2a53fea8 100644
--- a/askbot/deps/openid/test/test_fetchers.py
+++ b/askbot/deps/openid/test/test_fetchers.py
@@ -4,7 +4,7 @@ import sys
 import urllib2
 import socket
 
-from openid import fetchers
+from askbot.deps.openid import fetchers
 
 # XXX: make these separate test cases
 
diff --git a/askbot/deps/openid/test/test_htmldiscover.py b/askbot/deps/openid/test/test_htmldiscover.py
index 0a49e163..c6206bee 100644
--- a/askbot/deps/openid/test/test_htmldiscover.py
+++ b/askbot/deps/openid/test/test_htmldiscover.py
@@ -1,4 +1,4 @@
-from openid.consumer.discover import OpenIDServiceEndpoint
+from askbot.deps.openid.consumer.discover import OpenIDServiceEndpoint
 import datadriven
 
 class BadLinksTestCase(datadriven.DataDrivenTestCase):
diff --git a/askbot/deps/openid/test/test_message.py b/askbot/deps/openid/test/test_message.py
index 0bbd2800..4b363dcd 100644
--- a/askbot/deps/openid/test/test_message.py
+++ b/askbot/deps/openid/test/test_message.py
@@ -1,6 +1,6 @@
-from openid import message
-from openid import oidutil
-from openid.extensions import sreg
+from askbot.deps.openid import message
+from askbot.deps.openid import oidutil
+from askbot.deps.openid.extensions import sreg
 
 import urllib
 import cgi
diff --git a/askbot/deps/openid/test/test_negotiation.py b/askbot/deps/openid/test/test_negotiation.py
index c9c254a6..c572f9ec 100644
--- a/askbot/deps/openid/test/test_negotiation.py
+++ b/askbot/deps/openid/test/test_negotiation.py
@@ -2,10 +2,10 @@
 import unittest
 from support import CatchLogs
 
-from openid.message import Message, OPENID2_NS, OPENID1_NS, OPENID_NS
-from openid import association
-from openid.consumer.consumer import GenericConsumer, ServerError
-from openid.consumer.discover import OpenIDServiceEndpoint, OPENID_2_0_TYPE
+from askbot.deps.openid.message import Message, OPENID2_NS, OPENID1_NS, OPENID_NS
+from askbot.deps.openid import association
+from askbot.deps.openid.consumer.consumer import GenericConsumer, ServerError
+from askbot.deps.openid.consumer.discover import OpenIDServiceEndpoint, OPENID_2_0_TYPE
 
 class ErrorRaisingConsumer(GenericConsumer):
     """
diff --git a/askbot/deps/openid/test/test_nonce.py b/askbot/deps/openid/test/test_nonce.py
index 2138305c..5e5a13be 100644
--- a/askbot/deps/openid/test/test_nonce.py
+++ b/askbot/deps/openid/test/test_nonce.py
@@ -1,9 +1,9 @@
-from openid.test import datadriven
+from askbot.deps.openid.test import datadriven
 import time
 import unittest
 import re
 
-from openid.store.nonce import \
+from askbot.deps.openid.store.nonce import \
      mkNonce, \
      split as splitNonce, \
      checkTimestamp
diff --git a/askbot/deps/openid/test/test_openidyadis.py b/askbot/deps/openid/test/test_openidyadis.py
index 8573d3ce..dcebf186 100644
--- a/askbot/deps/openid/test/test_openidyadis.py
+++ b/askbot/deps/openid/test/test_openidyadis.py
@@ -1,8 +1,8 @@
 import unittest
-from openid.consumer.discover import \
+from askbot.deps.openid.consumer.discover import \
      OpenIDServiceEndpoint, OPENID_1_1_TYPE, OPENID_1_0_TYPE
 
-from openid.yadis.services import applyFilter
+from askbot.deps.openid.yadis.services import applyFilter
 
 
 XRDS_BOILERPLATE = '''\
diff --git a/askbot/deps/openid/test/test_pape.py b/askbot/deps/openid/test/test_pape.py
index ef47f60c..c54fb485 100644
--- a/askbot/deps/openid/test/test_pape.py
+++ b/askbot/deps/openid/test/test_pape.py
@@ -1,9 +1,9 @@
 
-from openid.extensions import pape
+from askbot.deps.openid.extensions import pape
 
 import unittest
 
 class PapeImportTestCase(unittest.TestCase):
     def test_version(self):
-        from openid.extensions.draft import pape5
+        from askbot.deps.openid.extensions.draft import pape5
         self.assert_(pape is pape5)
diff --git a/askbot/deps/openid/test/test_pape_draft2.py b/askbot/deps/openid/test/test_pape_draft2.py
index ed3d439f..7458a775 100644
--- a/askbot/deps/openid/test/test_pape_draft2.py
+++ b/askbot/deps/openid/test/test_pape_draft2.py
@@ -1,7 +1,7 @@
 
-from openid.extensions.draft import pape2 as pape
-from openid.message import *
-from openid.server import server
+from askbot.deps.openid.extensions.draft import pape2 as pape
+from askbot.deps.openid.message import *
+from askbot.deps.openid.server import server
 
 import unittest
 
diff --git a/askbot/deps/openid/test/test_pape_draft5.py b/askbot/deps/openid/test/test_pape_draft5.py
index d93ee96e..35b1a316 100644
--- a/askbot/deps/openid/test/test_pape_draft5.py
+++ b/askbot/deps/openid/test/test_pape_draft5.py
@@ -1,7 +1,7 @@
 
-from openid.extensions.draft import pape5 as pape
-from openid.message import *
-from openid.server import server
+from askbot.deps.openid.extensions.draft import pape5 as pape
+from askbot.deps.openid.message import *
+from askbot.deps.openid.server import server
 
 import warnings
 warnings.filterwarnings('ignore', module=__name__,
diff --git a/askbot/deps/openid/test/test_parsehtml.py b/askbot/deps/openid/test/test_parsehtml.py
index 2f962cdb..bd1b35c6 100644
--- a/askbot/deps/openid/test/test_parsehtml.py
+++ b/askbot/deps/openid/test/test_parsehtml.py
@@ -1,4 +1,4 @@
-from openid.yadis.parsehtml import YadisHTMLParser, ParseDone
+from askbot.deps.openid.yadis.parsehtml import YadisHTMLParser, ParseDone
 from HTMLParser import HTMLParseError
 
 import os.path, unittest, sys
diff --git a/askbot/deps/openid/test/test_rpverify.py b/askbot/deps/openid/test/test_rpverify.py
index 9d781bb1..2837cb8d 100644
--- a/askbot/deps/openid/test/test_rpverify.py
+++ b/askbot/deps/openid/test/test_rpverify.py
@@ -3,10 +3,10 @@
 
 __all__ = ['TestBuildDiscoveryURL']
 
-from openid.yadis.discover import DiscoveryResult, DiscoveryFailure
-from openid.yadis import services
-from openid.server import trustroot
-from openid.test.support import CatchLogs
+from askbot.deps.openid.yadis.discover import DiscoveryResult, DiscoveryFailure
+from askbot.deps.openid.yadis import services
+from askbot.deps.openid.server import trustroot
+from askbot.deps.openid.test.support import CatchLogs
 import unittest
 
 # Too many methods does not apply to unit test objects
diff --git a/askbot/deps/openid/test/test_server.py b/askbot/deps/openid/test/test_server.py
index 83261c8c..c843f762 100644
--- a/askbot/deps/openid/test/test_server.py
+++ b/askbot/deps/openid/test/test_server.py
@@ -1,10 +1,10 @@
 """Tests for openid.server.
 """
-from openid.server import server
-from openid import association, cryptutil, oidutil
-from openid.message import Message, OPENID_NS, OPENID2_NS, OPENID1_NS, \
+from askbot.deps.openid.server import server
+from askbot.deps.openid import association, cryptutil, oidutil
+from askbot.deps.openid.message import Message, OPENID_NS, OPENID2_NS, OPENID1_NS, \
      IDENTIFIER_SELECT, no_default, OPENID1_URL_LIMIT
-from openid.store import memstore
+from askbot.deps.openid.store import memstore
 import cgi
 
 import unittest
@@ -1424,8 +1424,8 @@ class TestAssociate(unittest.TestCase):
 
     def test_dhSHA1(self):
         self.assoc = self.signatory.createAssociation(dumb=False, assoc_type='HMAC-SHA1')
-        from openid.dh import DiffieHellman
-        from openid.server.server import DiffieHellmanSHA1ServerSession
+        from askbot.deps.openid.dh import DiffieHellman
+        from askbot.deps.openid.server.server import DiffieHellmanSHA1ServerSession
         consumer_dh = DiffieHellman.fromDefaults()
         cpub = consumer_dh.public
         server_dh = DiffieHellman.fromDefaults()
@@ -1452,8 +1452,8 @@ class TestAssociate(unittest.TestCase):
         def test_dhSHA256(self):
             self.assoc = self.signatory.createAssociation(
                 dumb=False, assoc_type='HMAC-SHA256')
-            from openid.dh import DiffieHellman
-            from openid.server.server import DiffieHellmanSHA256ServerSession
+            from askbot.deps.openid.dh import DiffieHellman
+            from askbot.deps.openid.server.server import DiffieHellmanSHA256ServerSession
             consumer_dh = DiffieHellman.fromDefaults()
             cpub = consumer_dh.public
             server_dh = DiffieHellman.fromDefaults()
@@ -1474,7 +1474,7 @@ class TestAssociate(unittest.TestCase):
             self.failUnlessEqual(secret, self.assoc.secret)
 
         def test_protoError256(self):
-            from openid.consumer.consumer import \
+            from askbot.deps.openid.consumer.consumer import \
                  DiffieHellmanSHA256ConsumerSession
 
             s256_session = DiffieHellmanSHA256ConsumerSession()
@@ -1499,7 +1499,7 @@ class TestAssociate(unittest.TestCase):
                                       message)
 
     def test_protoError(self):
-        from openid.consumer.consumer import DiffieHellmanSHA1ConsumerSession
+        from askbot.deps.openid.consumer.consumer import DiffieHellmanSHA1ConsumerSession
 
         s1_session = DiffieHellmanSHA1ConsumerSession()
 
diff --git a/askbot/deps/openid/test/test_services.py b/askbot/deps/openid/test/test_services.py
index 8708a3c5..9459cc24 100644
--- a/askbot/deps/openid/test/test_services.py
+++ b/askbot/deps/openid/test/test_services.py
@@ -1,7 +1,7 @@
 import unittest
 
-from openid.yadis import services
-from openid.yadis.discover import DiscoveryFailure, DiscoveryResult
+from askbot.deps.openid.yadis import services
+from askbot.deps.openid.yadis.discover import DiscoveryFailure, DiscoveryResult
 
 
 class TestGetServiceEndpoints(unittest.TestCase):
diff --git a/askbot/deps/openid/test/test_sreg.py b/askbot/deps/openid/test/test_sreg.py
index 49f9ea91..5c3af027 100644
--- a/askbot/deps/openid/test/test_sreg.py
+++ b/askbot/deps/openid/test/test_sreg.py
@@ -1,6 +1,6 @@
-from openid.extensions import sreg
-from openid.message import NamespaceMap, Message, registerNamespaceAlias
-from openid.server.server import OpenIDRequest, OpenIDResponse
+from askbot.deps.openid.extensions import sreg
+from askbot.deps.openid.message import NamespaceMap, Message, registerNamespaceAlias
+from askbot.deps.openid.server.server import OpenIDRequest, OpenIDResponse
 
 import unittest
 
diff --git a/askbot/deps/openid/test/test_symbol.py b/askbot/deps/openid/test/test_symbol.py
index 42ca2123..6f28048a 100644
--- a/askbot/deps/openid/test/test_symbol.py
+++ b/askbot/deps/openid/test/test_symbol.py
@@ -1,6 +1,6 @@
 import unittest
 
-from openid import oidutil
+from askbot.deps.openid import oidutil
 
 class SymbolTest(unittest.TestCase):
     def test_selfEquality(self):
diff --git a/askbot/deps/openid/test/test_urinorm.py b/askbot/deps/openid/test/test_urinorm.py
index 7f5ecaa1..ecc4344f 100644
--- a/askbot/deps/openid/test/test_urinorm.py
+++ b/askbot/deps/openid/test/test_urinorm.py
@@ -1,6 +1,6 @@
 import os
 import unittest
-import openid.urinorm
+from askbot.deps.openid import urinorm
 
 class UrinormTest(unittest.TestCase):
     def __init__(self, desc, case, expected):
@@ -14,7 +14,7 @@ class UrinormTest(unittest.TestCase):
 
     def runTest(self):
         try:
-            actual = openid.urinorm.urinorm(self.case)
+            actual = urinorm.urinorm(self.case)
         except ValueError, why:
             self.assertEqual(self.expected, 'fail', why)
         else:
diff --git a/askbot/deps/openid/test/test_verifydisco.py b/askbot/deps/openid/test/test_verifydisco.py
index e64a48a5..acf99f01 100644
--- a/askbot/deps/openid/test/test_verifydisco.py
+++ b/askbot/deps/openid/test/test_verifydisco.py
@@ -1,9 +1,9 @@
 import unittest
-from openid import message
-from openid.test.support import OpenIDTestMixin
-from openid.consumer import consumer
-from openid.test.test_consumer import TestIdRes
-from openid.consumer import discover
+from askbot.deps.openid import message
+from askbot.deps.openid.test.support import OpenIDTestMixin
+from askbot.deps.openid.consumer import consumer
+from askbot.deps.openid.test.test_consumer import TestIdRes
+from askbot.deps.openid.consumer import discover
 
 def const(result):
     """Return a function that ignores any arguments and just returns
diff --git a/askbot/deps/openid/test/test_xri.py b/askbot/deps/openid/test/test_xri.py
index dc5921ae..ddab614f 100644
--- a/askbot/deps/openid/test/test_xri.py
+++ b/askbot/deps/openid/test/test_xri.py
@@ -1,5 +1,5 @@
 from unittest import TestCase
-from openid.yadis import xri
+from askbot.deps.openid.yadis import xri
 
 class XriDiscoveryTestCase(TestCase):
     def test_isXRI(self):
diff --git a/askbot/deps/openid/test/test_xrires.py b/askbot/deps/openid/test/test_xrires.py
index 4e17e3b4..02d010d6 100644
--- a/askbot/deps/openid/test/test_xrires.py
+++ b/askbot/deps/openid/test/test_xrires.py
@@ -1,6 +1,6 @@
 
 from unittest import TestCase
-from openid.yadis import xrires
+from askbot.deps.openid.yadis import xrires
 
 class ProxyQueryTestCase(TestCase):
     def setUp(self):
diff --git a/askbot/deps/openid/test/test_yadis_discover.py b/askbot/deps/openid/test/test_yadis_discover.py
index 8a7677f3..aae83993 100644
--- a/askbot/deps/openid/test/test_yadis_discover.py
+++ b/askbot/deps/openid/test/test_yadis_discover.py
@@ -11,9 +11,9 @@ import urlparse
 import re
 import types
 
-from openid.yadis.discover import discover, DiscoveryFailure
+from askbot.deps.openid.yadis.discover import discover, DiscoveryFailure
 
-from openid import fetchers
+from askbot.deps.openid import fetchers
 
 import discoverdata
 
diff --git a/askbot/deps/openid/test/trustroot.py b/askbot/deps/openid/test/trustroot.py
index 236649ba..2c378823 100644
--- a/askbot/deps/openid/test/trustroot.py
+++ b/askbot/deps/openid/test/trustroot.py
@@ -1,6 +1,6 @@
 import os
 import unittest
-from openid.server.trustroot import TrustRoot
+from askbot.deps.openid.server.trustroot import TrustRoot
 
 class _ParseTest(unittest.TestCase):
     def __init__(self, sanity, desc, case):
diff --git a/askbot/deps/openid/yadis/constants.py b/askbot/deps/openid/yadis/constants.py
index 75ff96ef..83765b02 100644
--- a/askbot/deps/openid/yadis/constants.py
+++ b/askbot/deps/openid/yadis/constants.py
@@ -1,5 +1,5 @@
 __all__ = ['YADIS_HEADER_NAME', 'YADIS_CONTENT_TYPE', 'YADIS_ACCEPT_HEADER']
-from openid.yadis.accept import generateAcceptHeader
+from askbot.deps.openid.yadis.accept import generateAcceptHeader
 
 YADIS_HEADER_NAME = 'X-XRDS-Location'
 YADIS_CONTENT_TYPE = 'application/xrds+xml'
diff --git a/askbot/deps/openid/yadis/discover.py b/askbot/deps/openid/yadis/discover.py
index ed2adfde..7e714fde 100644
--- a/askbot/deps/openid/yadis/discover.py
+++ b/askbot/deps/openid/yadis/discover.py
@@ -3,11 +3,11 @@ __all__ = ['discover', 'DiscoveryResult', 'DiscoveryFailure']
 
 from cStringIO import StringIO
 
-from openid import fetchers
+from askbot.deps.openid import fetchers
 
-from openid.yadis.constants import \
+from askbot.deps.openid.yadis.constants import \
      YADIS_HEADER_NAME, YADIS_CONTENT_TYPE, YADIS_ACCEPT_HEADER
-from openid.yadis.parsehtml import MetaNotFound, findHTMLMeta
+from askbot.deps.openid.yadis.parsehtml import MetaNotFound, findHTMLMeta
 
 class DiscoveryFailure(Exception):
     """Raised when a YADIS protocol error occurs in the discovery process"""
diff --git a/askbot/deps/openid/yadis/etxrd.py b/askbot/deps/openid/yadis/etxrd.py
index ef5cadfe..7c921389 100644
--- a/askbot/deps/openid/yadis/etxrd.py
+++ b/askbot/deps/openid/yadis/etxrd.py
@@ -24,7 +24,7 @@ import random
 from datetime import datetime
 from time import strptime
 
-from openid.oidutil import importElementTree
+from askbot.deps.openid.oidutil import importElementTree
 ElementTree = importElementTree()
 
 # the different elementtree modules don't have a common exception
@@ -40,7 +40,7 @@ except (SystemExit, MemoryError, AssertionError, ImportError):
 except:
     XMLError = sys.exc_info()[0]
 
-from openid.yadis import xri
+from askbot.deps.openid.yadis import xri
 
 class XRDSError(Exception):
     """An error with the XRDS document."""
diff --git a/askbot/deps/openid/yadis/filters.py b/askbot/deps/openid/yadis/filters.py
index d01c221b..0008fd2f 100644
--- a/askbot/deps/openid/yadis/filters.py
+++ b/askbot/deps/openid/yadis/filters.py
@@ -11,7 +11,7 @@ __all__ = [
     'CompoundFilter',
     ]
 
-from openid.yadis.etxrd import expandService
+from askbot.deps.openid.yadis.etxrd import expandService
 
 class BasicServiceEndpoint(object):
     """Generic endpoint object that contains parsed service
diff --git a/askbot/deps/openid/yadis/parsehtml.py b/askbot/deps/openid/yadis/parsehtml.py
index 875a089c..948fef86 100644
--- a/askbot/deps/openid/yadis/parsehtml.py
+++ b/askbot/deps/openid/yadis/parsehtml.py
@@ -4,7 +4,7 @@ from HTMLParser import HTMLParser, HTMLParseError
 import htmlentitydefs
 import re
 
-from openid.yadis.constants import YADIS_HEADER_NAME
+from askbot.deps.openid.yadis.constants import YADIS_HEADER_NAME
 
 # Size of the chunks to search at a time (also the amount that gets
 # read at a time)
diff --git a/askbot/deps/openid/yadis/services.py b/askbot/deps/openid/yadis/services.py
index 4753c194..dad230c1 100644
--- a/askbot/deps/openid/yadis/services.py
+++ b/askbot/deps/openid/yadis/services.py
@@ -1,8 +1,8 @@
 # -*- test-case-name: openid.test.test_services -*-
 
-from openid.yadis.filters import mkFilter
-from openid.yadis.discover import discover, DiscoveryFailure
-from openid.yadis.etxrd import parseXRDS, iterServices, XRDSError
+from askbot.deps.openid.yadis.filters import mkFilter
+from askbot.deps.openid.yadis.discover import discover, DiscoveryFailure
+from askbot.deps.openid.yadis.etxrd import parseXRDS, iterServices, XRDSError
 
 def getServiceEndpoints(input_url, flt=None):
     """Perform the Yadis protocol on the input URL and return an
diff --git a/askbot/deps/openid/yadis/xrires.py b/askbot/deps/openid/yadis/xrires.py
index be663c66..33cc6d65 100644
--- a/askbot/deps/openid/yadis/xrires.py
+++ b/askbot/deps/openid/yadis/xrires.py
@@ -3,10 +3,10 @@
 """
 
 from urllib import urlencode
-from openid import fetchers
-from openid.yadis import etxrd
-from openid.yadis.xri import toURINormal
-from openid.yadis.services import iterServices
+from askbot.deps.openid import fetchers
+from askbot.deps.openid.yadis import etxrd
+from askbot.deps.openid.yadis.xri import toURINormal
+from askbot.deps.openid.yadis.services import iterServices
 
 DEFAULT_PROXY = 'http://proxy.xri.net/'