summaryrefslogtreecommitdiff
path: root/src/leap/services
diff options
context:
space:
mode:
authordrebs <drebs@leap.se>2013-05-28 20:51:58 -0300
committerdrebs <drebs@leap.se>2013-05-29 11:15:31 -0300
commit116f559198e0a9c26e9291209e81190bb27ef5cf (patch)
treed7a62ba9387a382c3380f7a40161be29e8ce9039 /src/leap/services
parentb24fd83c64f2b166a192e9cf7835e5f35a15c1e5 (diff)
Move KeyManager submodule from leap.common to here.
Diffstat (limited to 'src/leap/services')
-rw-r--r--src/leap/services/soledad/soledadbootstrapper.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/leap/services/soledad/soledadbootstrapper.py b/src/leap/services/soledad/soledadbootstrapper.py
index bae933de..2869e098 100644
--- a/src/leap/services/soledad/soledadbootstrapper.py
+++ b/src/leap/services/soledad/soledadbootstrapper.py
@@ -29,8 +29,8 @@ from mock import Mock
from leap.common.check import leap_assert, leap_assert_type
from leap.common.files import get_mtime
-from leap.common.keymanager import KeyManager, openpgp
-from leap.common.keymanager.errors import KeyNotFound
+from leap.keymanager import KeyManager, openpgp
+from leap.keymanager.errors import KeyNotFound
from leap.config.providerconfig import ProviderConfig
from leap.crypto.srpauth import SRPAuth
from leap.services.soledad.soledadconfig import SoledadConfig