fix imports to use new namespace

4 files changed, 13 insertions, 12 deletions

diff --git a/src/leap/bitmask/crypto/srpauth.py b/src/leap/bitmask/crypto/srpauth.py
index fc0533fc..2d34bb74 100644
--- a/src/leap/bitmask/crypto/srpauth.py
+++ b/src/leap/bitmask/crypto/srpauth.py
@@ -29,9 +29,9 @@ from functools import partial
 from PySide import QtCore
 from twisted.internet import threads
 
+from leap.bitmask.util import request_helpers as reqhelper
+from leap.bitmask.util.constants import REQUEST_TIMEOUT
 from leap.common.check import leap_assert
-from leap.util.constants import REQUEST_TIMEOUT
-from leap.util import request_helpers as reqhelper
 from leap.common.events import signal as events_signal
 from leap.common.events import events_pb2 as proto
 
diff --git a/src/leap/bitmask/crypto/srpregister.py b/src/leap/bitmask/crypto/srpregister.py
index de1978b5..c69294d7 100644
--- a/src/leap/bitmask/crypto/srpregister.py
+++ b/src/leap/bitmask/crypto/srpregister.py
@@ -24,8 +24,8 @@ import srp
 from PySide import QtCore
 from urlparse import urlparse
 
-from leap.config.providerconfig import ProviderConfig
-from leap.util.constants import SIGNUP_TIMEOUT
+from leap.bitmask.config.providerconfig import ProviderConfig
+from leap.bitmask.util.constants import SIGNUP_TIMEOUT
 from leap.common.check import leap_assert, leap_assert_type
 
 logger = logging.getLogger(__name__)
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)