Archives/DeDRM_tools
2
0
Fork 0
mirror of https://github.com/apprenticeharper/DeDRM_tools synced 2024-11-07 09:20:27 +00:00
Code Issues Releases Wiki Activity

Merge pull request #971 from cgaspar/master

Browse Source 
Update lzma import to include calibre >= 4.6.0
This commit is contained in:
Apprentice Harper 2020-01-19 14:48:20 +00:00 committed by GitHub
commit 5d8dc595ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dedrm_src/ion.py
View File

@ -21,7 +21,12 @@ from Crypto.Cipher import AES
from Crypto.Util.py3compat import bchr, bord from Crypto.Util.py3compat import bchr, bord
try: 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 # lzma library from calibre 2.35.0 or later
try:
import lzma.lzma1 as calibre_lzma import lzma.lzma1 as calibre_lzma
except ImportError: except ImportError:
calibre_lzma = None calibre_lzma = None