From 52ab64716696b500abe7052e49da7f5417e8cffc Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@leap.se>
Date: Tue, 12 Sep 2017 18:08:39 +0200
Subject: [bug] fail gracefully if latest six lib not found

- Resolves: #8668
---
 src/leap/mx/soledadhelper.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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
-- 
cgit v1.2.3