summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorIvan Alejandro <ivanalejandro0@gmail.com>2015-01-05 14:12:49 -0300
committerIvan Alejandro <ivanalejandro0@gmail.com>2015-01-05 14:12:49 -0300
commitb9326cfceb304cebeb97017ebb8d22ba06f98f75 (patch)
treec0b796b25fc9af74485074d35c8a108d69c2ca37 /src
parent34bdb47251b93bcfc767aec341490386a08ba4a6 (diff)
Revert "Fix soledad imports (#5989)."0.8.0rc2
This reverts commit 93750f2371555ad0c769c62c1bd179e2b96c282c.
Diffstat (limited to 'src')
-rw-r--r--src/leap/bitmask/backend/components.py2
-rw-r--r--src/leap/bitmask/services/soledad/soledadbootstrapper.py3
2 files changed, 2 insertions, 3 deletions
diff --git a/src/leap/bitmask/backend/components.py b/src/leap/bitmask/backend/components.py
index 87950072..4b63af84 100644
--- a/src/leap/bitmask/backend/components.py
+++ b/src/leap/bitmask/backend/components.py
@@ -61,7 +61,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 a360b5c2..2044a27c 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__)