Update lzma import to include calibre >= 4.6.0

2020-01-04 05:20:16 -08:00 · 2020-01-04 05:20:16 -08:00 · fc6f830088
parent b71ed3887e
commit fc6f830088
1 changed files with 12 additions and 7 deletions
--- a/dedrm_src/ion.py
+++ b/dedrm_src/ion.py
@ -21,9 +21,14 @@ from Crypto.Cipher import AES
 from Crypto.Util.py3compat import bchr, bord

 try:
-    # lzma library from calibre 2.35.0 or later
-    import lzma.lzma1 as calibre_lzma
+    # lzma library from calibre 4.6.0 or later
+    import calibre_lzma.lzma1 as calibre_lzma
 except ImportError:
+    calibre_lzma = None
+    # lzma library from calibre 2.35.0 or later
+    try:
+        import lzma.lzma1 as calibre_lzma
+    except ImportError:
        calibre_lzma = None
        try:
            import lzma