From: Zhuoyun Wei <wzyboy@wzyboy.org>
Date: Wed, 18 Apr 2018 08:57:07 +0000 (-0400)
Subject: Use pylzma as a fallback
X-Git-Url: http://git.xmof.duckdns.org/?a=commitdiff_plain;h=4f1e9fcf43b70cfb2032bf2959c5a170bc3b2225;p=DeDRM.git

Use pylzma as a fallback
---

diff --git a/DeDRM_calibre_plugin/DeDRM_plugin/ion.py b/DeDRM_calibre_plugin/DeDRM_plugin/ion.py
index c100191..40433ca 100644
--- a/DeDRM_calibre_plugin/DeDRM_plugin/ion.py
+++ b/DeDRM_calibre_plugin/DeDRM_plugin/ion.py
@@ -23,13 +23,17 @@ from Crypto.Util.py3compat import bchr, bord
 try:
     # lzma library from calibre 2.35.0 or later
     import lzma.lzma1 as calibre_lzma
-except:
+except ImportError:
     calibre_lzma = None
     try:
         import lzma
-    except:
+    except ImportError:
         # Need pip backports.lzma on Python <3.3
-        from backports import lzma
+        try:
+            from backports import lzma
+        except ImportError:
+            # Windows-friendly choice: pylzma wheels
+            import pylzma as lzma
 
 
 TID_NULL = 0