summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordrebs <drebs@leap.se>2014-08-18 11:36:09 -0300
committerTomás Touceda <chiiph@leap.se>2014-09-26 10:16:36 -0300
commit93750f2371555ad0c769c62c1bd179e2b96c282c (patch)
tree5fade308570838df539deccede6f161a53408f3f
parent6f7177f3ca359f8c3e74d094b0dcd0f9239fb069 (diff)
Fix soledad imports (#5989).
-rw-r--r--changes/bug_5989_fix-soledad-imports1
-rw-r--r--src/leap/bitmask/backend/components.py2
-rw-r--r--src/leap/bitmask/services/soledad/soledadbootstrapper.py3
3 files changed, 4 insertions, 2 deletions
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 5ef6befd..d4f6d176 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__)