summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2014-09-24 15:57:52 -0500
committerKali Kaneko <kali@leap.se>2014-09-24 15:57:52 -0500
commit8a588c042f982a9f5b58fb28e5551fe36d833511 (patch)
treec9d6a3d6f03c233f811137edab63acd4dbf8d2fc /src
parent3dca0582d620756ebbf3ec8174097d7ac1e42b3b (diff)
revert soledad imports
since we're not publishing the newest soledad packages yet
Diffstat (limited to 'src')
-rw-r--r--src/leap/bitmask/backend/components.py2
-rw-r--r--src/leap/bitmask/services/soledad/soledadbootstrapper.py2
2 files changed, 2 insertions, 2 deletions
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..02ad9403 100644
--- a/src/leap/bitmask/services/soledad/soledadbootstrapper.py
+++ b/src/leap/bitmask/services/soledad/soledadbootstrapper.py
@@ -46,7 +46,7 @@ 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 BootstrapSequenceError
logger = logging.getLogger(__name__)