From 4f1e9fcf43b70cfb2032bf2959c5a170bc3b2225 Mon Sep 17 00:00:00 2001 From: Zhuoyun Wei Date: Wed, 18 Apr 2018 04:57:07 -0400 Subject: [PATCH] Use pylzma as a fallback --- DeDRM_calibre_plugin/DeDRM_plugin/ion.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) 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