[refactor] fix imports after merging submodules

3 files changed, 11 insertions, 13 deletions

diff --git a/src/leap/bitmask/keymanager/keys.py b/src/leap/bitmask/keymanager/keys.py
index 91ecf3a..2ea4c8e 100644
--- a/src/leap/bitmask/keymanager/keys.py
+++ b/src/leap/bitmask/keymanager/keys.py
@@ -17,8 +17,6 @@
 """
 Abstact key type and encryption scheme representations.
 """
-
-
 import json
 import logging
 import re
@@ -26,10 +24,10 @@ import time
 
 from datetime import datetime
 
-from leap.keymanager import errors
-from leap.keymanager.wrapper import TempGPGWrapper
-from leap.keymanager.validation import ValidationLevels
-from leap.keymanager import documents as doc
+from leap.bitmask.keymanager import errors
+from leap.bitmask.keymanager.wrapper import TempGPGWrapper
+from leap.bitmask.keymanager.validation import ValidationLevels
+from leap.bitmask.keymanager import documents as doc
 
 logger = logging.getLogger(__name__)
 
diff --git a/src/leap/bitmask/keymanager/migrator.py b/src/leap/bitmask/keymanager/migrator.py
index c73da2e..979590c 100644
--- a/src/leap/bitmask/keymanager/migrator.py
+++ b/src/leap/bitmask/keymanager/migrator.py
@@ -26,8 +26,8 @@ Document migrator
 from collections import namedtuple
 from twisted.internet.defer import gatherResults, succeed
 
-from leap.keymanager import documents as doc
-from leap.keymanager.validation import ValidationLevels
+from leap.bitmask.keymanager import documents as doc
+from leap.bitmask.keymanager.validation import ValidationLevels
 
 
 KEY_ID_KEY = 'key_id'
diff --git a/src/leap/bitmask/keymanager/openpgp.py b/src/leap/bitmask/keymanager/openpgp.py
index 31c13df..b07ac41 100644
--- a/src/leap/bitmask/keymanager/openpgp.py
+++ b/src/leap/bitmask/keymanager/openpgp.py
@@ -32,15 +32,15 @@ from twisted.internet import defer
 from twisted.internet.threads import deferToThread
 
 from leap.common.check import leap_assert, leap_assert_type, leap_check
-from leap.keymanager import errors
-from leap.keymanager.wrapper import TempGPGWrapper
-from leap.keymanager.keys import (
+from leap.bitmask.keymanager import errors
+from leap.bitmask.keymanager.wrapper import TempGPGWrapper
+from leap.bitmask.keymanager.keys import (
     OpenPGPKey,
     is_address,
     parse_address,
     build_key_from_dict,
 )
-from leap.keymanager.documents import (
+from leap.bitmask.keymanager.documents import (
     init_indexes,
     TAGS_PRIVATE_INDEX,
     TYPE_FINGERPRINT_PRIVATE_INDEX,
@@ -108,7 +108,7 @@ class OpenPGPScheme(object):
         self._wait_indexes("get_key", "put_key", "get_all_keys")
 
     def _migrate_documents_schema(self, _):
-        from leap.keymanager.migrator import KeyDocumentsMigrator
+        from leap.bitmask.keymanager.migrator import KeyDocumentsMigrator
         migrator = KeyDocumentsMigrator(self._soledad)
         return migrator.migrate()