From 8a588c042f982a9f5b58fb28e5551fe36d833511 Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Wed, 24 Sep 2014 15:57:52 -0500 Subject: revert soledad imports since we're not publishing the newest soledad packages yet --- src/leap/bitmask/backend/components.py | 2 +- src/leap/bitmask/services/soledad/soledadbootstrapper.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/leap') 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__) -- cgit v1.2.3