Merge pull request #971 from cgaspar/master

Update lzma import to include calibre >= 4.6.0
4 years ago · 5d8dc595ce
parent b71ed3887e fc6f830088
commit 5d8dc595ce
1 changed files with 12 additions and 7 deletions
--- a/dedrm_src/ion.py
+++ b/dedrm_src/ion.py
@ -21,7 +21,12 @@ from Crypto.Cipher import AES
 from Crypto.Util.py3compat import bchr, bord

 try:
+    # 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