summaryrefslogtreecommitdiff
path: root/src/leap/bitmask
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2014-08-18 11:40:58 -0300
committerTomás Touceda <chiiph@leap.se>2014-08-18 11:40:58 -0300
commitb03d0a9034534c12b2b4c48de6b614d7cea0052b (patch)
treefcabfc5dae2e834df68f685522e45ceab19956e7 /src/leap/bitmask
parent3de4842c07549c59eeb7f8ab559969d31c1ff1b7 (diff)
parent7fcc4f40eaa8214de8ae20cd71d173337ad64290 (diff)
Merge remote-tracking branch 'refs/remotes/drebs/bug/5989_fix-soledad-imports' into develop
Diffstat (limited to 'src/leap/bitmask')
-rw-r--r--src/leap/bitmask/backend/components.py2
-rw-r--r--src/leap/bitmask/services/soledad/soledadbootstrapper.py3
2 files changed, 3 insertions, 2 deletions
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__)