mirror of
https://github.com/apprenticeharper/DeDRM_tools
synced 2024-11-07 09:20:27 +00:00
Propagate changes
This commit is contained in:
parent
4f1e9fcf43
commit
12ce977d79
@ -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
|
||||
|
@ -15,9 +15,9 @@ except ImportError:
|
||||
from StringIO import StringIO
|
||||
|
||||
try:
|
||||
import ion
|
||||
except:
|
||||
from calibre_plugins.dedrm import ion
|
||||
except ImportError:
|
||||
import ion
|
||||
|
||||
|
||||
__license__ = 'GPL v3'
|
||||
|
@ -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
|
||||
|
@ -15,9 +15,9 @@ except ImportError:
|
||||
from StringIO import StringIO
|
||||
|
||||
try:
|
||||
import ion
|
||||
except:
|
||||
from calibre_plugins.dedrm import ion
|
||||
except ImportError:
|
||||
import ion
|
||||
|
||||
|
||||
__license__ = 'GPL v3'
|
||||
|
Loading…
Reference in New Issue
Block a user