summaryrefslogtreecommitdiff
path: root/src/leap/mx
diff options
context:
space:
mode:
Diffstat (limited to 'src/leap/mx')
-rw-r--r--src/leap/mx/soledadhelper.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/leap/mx/soledadhelper.py b/src/leap/mx/soledadhelper.py
index 4b2a099..386179e 100644
--- a/src/leap/mx/soledadhelper.py
+++ b/src/leap/mx/soledadhelper.py
@@ -24,10 +24,15 @@ See: http://soledad.readthedocs.io/en/latest/incoming_box.html
import base64
import treq
-from six import raise_from
from io import BytesIO
from twisted.internet import defer
+try:
+ from six import raise_from
+except ImportError:
+ def raise_from(value, from_value):
+ raise value
+
class UnavailableIncomingAPIException(Exception):
pass