summaryrefslogtreecommitdiff
path: root/service/pixelated/bitmask_libraries
diff options
context:
space:
mode:
authorBruno Wagner <bwgpro@gmail.com>2015-03-18 16:08:23 -0300
committerBruno Wagner <bwgpro@gmail.com>2015-03-18 16:10:01 -0300
commite505894007c9adabc673ac6b1a09f6216eda475c (patch)
treec93f8d6727ee9ebddeb5f759b60dfc37e9507ada /service/pixelated/bitmask_libraries
parenta822cb212a93d05d56aa18ca7ef0463a6be4506e (diff)
Non exception was being caught by soledad
Diffstat (limited to 'service/pixelated/bitmask_libraries')
-rw-r--r--service/pixelated/bitmask_libraries/soledad.py4
1 files 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):