diff options
| author | Tomás Touceda <chiiph@leap.se> | 2013-05-30 10:27:44 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2013-05-30 10:27:44 -0300 |
| commit | 15fa6e076e03e82e17a113513e3588023058b72e (patch) | |
| tree | 35727d59c51833cff032555eb3e74f3d29816646 /src/leap/services/soledad/soledadbootstrapper.py | |
| parent | 1f3573503be0cf7d61fa80ea866b8bef4a57b111 (diff) | |
| parent | 114773067a962289d55b20c8c54df3747b9f75f1 (diff) | |
Merge remote-tracking branch 'drebs/feature/2683-move-keymanager-to-leap_client-2' into develop
Conflicts:
setup.py
Diffstat (limited to 'src/leap/services/soledad/soledadbootstrapper.py')
| -rw-r--r-- | src/leap/services/soledad/soledadbootstrapper.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/leap/services/soledad/soledadbootstrapper.py b/src/leap/services/soledad/soledadbootstrapper.py index db019a87..eea9b0d5 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 |