diff options
| author | Kali Kaneko (leap communications) <kali@leap.se> | 2016-09-01 00:12:28 -0400 |
|---|---|---|
| committer | Kali Kaneko (leap communications) <kali@leap.se> | 2016-09-01 00:52:34 -0400 |
| commit | 662aed784218a45efbf563ff6150fcb9f1aa81aa (patch) | |
| tree | 9ac2f47fb24f50d3ada1a4a4a0819d6ef909901e /src/leap/bitmask/keymanager/openpgp.py | |
| parent | 2a46b146135aa5694eb9de288c24037051268fdf (diff) | |
[refactor] fix imports after merging submodules
Diffstat (limited to 'src/leap/bitmask/keymanager/openpgp.py')
| -rw-r--r-- | src/leap/bitmask/keymanager/openpgp.py | 10 |
1 files changed, 5 insertions, 5 deletions
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() |