diff options
| author | Tomás Touceda <chiiph@leap.se> | 2014-09-26 10:13:44 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2014-09-26 10:13:44 -0300 |
| commit | 0db3d5a4aecc0a3c271b92c6187922c50d46df0a (patch) | |
| tree | f04b0eb5c4665a129c5c49719b2da65d325b111f | |
| parent | 5767efd10a2f794fe9367722bfb1ca114e63733a (diff) | |
Revert "Fix soledad imports (#5989)."
This reverts commit 7fcc4f40eaa8214de8ae20cd71d173337ad64290.
| -rw-r--r-- | changes/bug_5989_fix-soledad-imports | 1 | ||||
| -rw-r--r-- | src/leap/bitmask/backend/components.py | 2 | ||||
| -rw-r--r-- | src/leap/bitmask/services/soledad/soledadbootstrapper.py | 3 |
3 files changed, 2 insertions, 4 deletions
diff --git a/changes/bug_5989_fix-soledad-imports b/changes/bug_5989_fix-soledad-imports deleted file mode 100644 index 3b425287..00000000 --- a/changes/bug_5989_fix-soledad-imports +++ /dev/null @@ -1 +0,0 @@ -- Fix soledad imports (#5989). diff --git a/src/leap/bitmask/backend/components.py b/src/leap/bitmask/backend/components.py index d4f6d176..5ef6befd 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.secrets import NoStorageSecret, PassphraseTooShort +from leap.soledad.client 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 745645f3..c4e43bfe 100644 --- a/src/leap/bitmask/services/soledad/soledadbootstrapper.py +++ b/src/leap/bitmask/services/soledad/soledadbootstrapper.py @@ -45,8 +45,7 @@ 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 -from leap.soledad.client.secrets import BootstrapSequenceError +from leap.soledad.client import Soledad, BootstrapSequenceError logger = logging.getLogger(__name__) |