diff options
author | Kali Kaneko <kali@leap.se> | 2013-08-12 18:31:37 +0200 |
---|---|---|
committer | Kali Kaneko <kali@leap.se> | 2013-08-12 21:01:51 +0200 |
commit | 6920483c29609d233023be8d40130cf6f0030652 (patch) | |
tree | c07f70b2e7c2a29cb82f8fd327af5de6ee6ce2da /src/leap/bitmask/crypto/tests | |
parent | 6da8d09846db4d2eed01e488bc6a6f5ba48b959f (diff) |
fix imports to use new namespace
Diffstat (limited to 'src/leap/bitmask/crypto/tests')
-rw-r--r-- | src/leap/bitmask/crypto/tests/test_srpauth.py | 11 | ||||
-rw-r--r-- | src/leap/bitmask/crypto/tests/test_srpregister.py | 6 |
2 files changed, 9 insertions, 8 deletions
diff --git a/src/leap/bitmask/crypto/tests/test_srpauth.py b/src/leap/bitmask/crypto/tests/test_srpauth.py index e3258fd3..043da15e 100644 --- a/src/leap/bitmask/crypto/tests/test_srpauth.py +++ b/src/leap/bitmask/crypto/tests/test_srpauth.py @@ -28,19 +28,20 @@ import binascii import requests import mock +from functools import partial + from mock import MagicMock from nose.twistedtools import reactor, deferred from twisted.python import log from twisted.internet import threads -from functools import partial from requests.models import Response from simplejson.decoder import JSONDecodeError +from leap.bitmask.config.providerconfig import ProviderConfig +from leap.bitmask.crypto import srpregister, srpauth +from leap.bitmask.crypto.tests import fake_provider +from leap.bitmask.util.request_helpers import get_content from leap.common.testing.https_server import where -from leap.config.providerconfig import ProviderConfig -from leap.crypto import srpregister, srpauth -from leap.crypto.tests import fake_provider -from leap.util.request_helpers import get_content log.startLogging(sys.stdout) diff --git a/src/leap/bitmask/crypto/tests/test_srpregister.py b/src/leap/bitmask/crypto/tests/test_srpregister.py index 66b815f2..4d6e7be3 100644 --- a/src/leap/bitmask/crypto/tests/test_srpregister.py +++ b/src/leap/bitmask/crypto/tests/test_srpregister.py @@ -30,10 +30,10 @@ from nose.twistedtools import reactor, deferred from twisted.python import log from twisted.internet import threads +from leap.bitmask.config.providerconfig import ProviderConfig +from leap.bitmask.crypto import srpregister, srpauth +from leap.bitmask.crypto.tests import fake_provider from leap.common.testing.https_server import where -from leap.config.providerconfig import ProviderConfig -from leap.crypto import srpregister, srpauth -from leap.crypto.tests import fake_provider log.startLogging(sys.stdout) |