From e505894007c9adabc673ac6b1a09f6216eda475c Mon Sep 17 00:00:00 2001 From: Bruno Wagner Date: Wed, 18 Mar 2015 16:08:23 -0300 Subject: Non exception was being caught by soledad --- service/pixelated/bitmask_libraries/soledad.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/service/pixelated/bitmask_libraries/soledad.py b/service/pixelated/bitmask_libraries/soledad.py index e6607bde..1c46f2ab 100644 --- a/service/pixelated/bitmask_libraries/soledad.py +++ b/service/pixelated/bitmask_libraries/soledad.py @@ -18,7 +18,7 @@ import errno import os from leap.keymanager import KeyManager from leap.soledad.client import Soledad -from leap.soledad.common.crypto import WrongMac, UnknownMacMethod, MacMethods +from leap.soledad.common.crypto import WrongMac, UnknownMacMethod from .certs import which_bundle @@ -69,7 +69,7 @@ class SoledadSession(object): return Soledad(self.leap_srp_session.uuid, unicode(encryption_passphrase), secrets, local_db, server_url, which_bundle(self.provider), self.leap_srp_session.token, defer_encryption=False) - except (WrongMac, UnknownMacMethod, MacMethods), e: + except (WrongMac, UnknownMacMethod), e: raise SoledadWrongPassphraseException(e) def _leap_path(self): -- cgit v1.2.3