summaryrefslogtreecommitdiff
path: root/src/leap/mx/soledadhelper.py
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2017-09-12 18:08:39 +0200
committerKali Kaneko <kali@leap.se>2017-09-12 18:08:39 +0200
commit52ab64716696b500abe7052e49da7f5417e8cffc (patch)
treeec8bf4e53c7983fff8cc798ea01c70b7b406ce9c /src/leap/mx/soledadhelper.py
parent404574bf251287bb9a8d8fe58ca54bb56123b1a4 (diff)
[bug] fail gracefully if latest six lib not found
- Resolves: #8668
Diffstat (limited to 'src/leap/mx/soledadhelper.py')
-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