From 7fcc4f40eaa8214de8ae20cd71d173337ad64290 Mon Sep 17 00:00:00 2001 From: drebs Date: Mon, 18 Aug 2014 11:36:09 -0300 Subject: Fix soledad imports (#5989). --- changes/bug_5989_fix-soledad-imports | 1 + src/leap/bitmask/backend/components.py | 2 +- src/leap/bitmask/services/soledad/soledadbootstrapper.py | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 changes/bug_5989_fix-soledad-imports diff --git a/changes/bug_5989_fix-soledad-imports b/changes/bug_5989_fix-soledad-imports new file mode 100644 index 00000000..3b425287 --- /dev/null +++ b/changes/bug_5989_fix-soledad-imports @@ -0,0 +1 @@ +- Fix soledad imports (#5989). diff --git a/src/leap/bitmask/backend/components.py b/src/leap/bitmask/backend/components.py index f721086b..960a922e 100644 --- a/src/leap/bitmask/backend/components.py +++ b/src/leap/bitmask/backend/components.py @@ -60,7 +60,7 @@ from leap.common import certs as leap_certs from leap.keymanager import openpgp from leap.keymanager.errors import KeyAddressMismatch, KeyFingerprintMismatch -from leap.soledad.client import NoStorageSecret, PassphraseTooShort +from leap.soledad.client.secrets import NoStorageSecret, PassphraseTooShort logger = logging.getLogger(__name__) diff --git a/src/leap/bitmask/services/soledad/soledadbootstrapper.py b/src/leap/bitmask/services/soledad/soledadbootstrapper.py index c4e43bfe..745645f3 100644 --- a/src/leap/bitmask/services/soledad/soledadbootstrapper.py +++ b/src/leap/bitmask/services/soledad/soledadbootstrapper.py @@ -45,7 +45,8 @@ from leap.common.files import which from leap.keymanager import KeyManager, openpgp from leap.keymanager.errors import KeyNotFound from leap.soledad.common.errors import InvalidAuthTokenError -from leap.soledad.client import Soledad, BootstrapSequenceError +from leap.soledad.client import Soledad +from leap.soledad.client.secrets import BootstrapSequenceError logger = logging.getLogger(__name__) -- cgit v1.2.3