From b9326cfceb304cebeb97017ebb8d22ba06f98f75 Mon Sep 17 00:00:00 2001 From: Ivan Alejandro <ivanalejandro0@gmail.com> Date: Mon, 5 Jan 2015 14:12:49 -0300 Subject: [PATCH] Revert "Fix soledad imports (#5989)." This reverts commit 93750f2371555ad0c769c62c1bd179e2b96c282c. --- changes/bug_5989_fix-soledad-imports | 1 - src/leap/bitmask/backend/components.py | 2 +- src/leap/bitmask/services/soledad/soledadbootstrapper.py | 3 +-- 3 files changed, 2 insertions(+), 4 deletions(-) delete mode 100644 changes/bug_5989_fix-soledad-imports diff --git a/changes/bug_5989_fix-soledad-imports b/changes/bug_5989_fix-soledad-imports deleted file mode 100644 index 3b425287d..000000000 --- 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 879500720..4b63af848 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 a360b5c2d..2044a27c1 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__) -- GitLab