diff --git a/changes/bug_5989_fix-soledad-imports b/changes/bug_5989_fix-soledad-imports deleted file mode 100644 index 3b425287d024267fc889a901980bffdc72a1b25d..0000000000000000000000000000000000000000 --- 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 879500720d34a7617cb60bde3df6d4b4b11ea6ed..4b63af8481b32bd1c405056327385ba1573efec3 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 a360b5c2de453d696d58ac4cf74bb30b3f4ccf1d..2044a27c19f55c985de6bc414ec701e105a94696 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__)