mirror of
https://github.com/apprenticeharper/DeDRM_tools
synced 2024-12-27 09:58:59 +01:00
Propagate changes
This commit is contained in:
parent
4f1e9fcf43
commit
12ce977d79
4 changed files with 18 additions and 10 deletions
|
@ -23,13 +23,17 @@ from Crypto.Util.py3compat import bchr, bord
|
||||||
try:
|
try:
|
||||||
# lzma library from calibre 2.35.0 or later
|
# lzma library from calibre 2.35.0 or later
|
||||||
import lzma.lzma1 as calibre_lzma
|
import lzma.lzma1 as calibre_lzma
|
||||||
except:
|
except ImportError:
|
||||||
calibre_lzma = None
|
calibre_lzma = None
|
||||||
try:
|
try:
|
||||||
import lzma
|
import lzma
|
||||||
except:
|
except ImportError:
|
||||||
# Need pip backports.lzma on Python <3.3
|
# 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
|
TID_NULL = 0
|
||||||
|
|
|
@ -15,9 +15,9 @@ except ImportError:
|
||||||
from StringIO import StringIO
|
from StringIO import StringIO
|
||||||
|
|
||||||
try:
|
try:
|
||||||
import ion
|
|
||||||
except:
|
|
||||||
from calibre_plugins.dedrm import ion
|
from calibre_plugins.dedrm import ion
|
||||||
|
except ImportError:
|
||||||
|
import ion
|
||||||
|
|
||||||
|
|
||||||
__license__ = 'GPL v3'
|
__license__ = 'GPL v3'
|
||||||
|
|
|
@ -23,13 +23,17 @@ from Crypto.Util.py3compat import bchr, bord
|
||||||
try:
|
try:
|
||||||
# lzma library from calibre 2.35.0 or later
|
# lzma library from calibre 2.35.0 or later
|
||||||
import lzma.lzma1 as calibre_lzma
|
import lzma.lzma1 as calibre_lzma
|
||||||
except:
|
except ImportError:
|
||||||
calibre_lzma = None
|
calibre_lzma = None
|
||||||
try:
|
try:
|
||||||
import lzma
|
import lzma
|
||||||
except:
|
except ImportError:
|
||||||
# Need pip backports.lzma on Python <3.3
|
# 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
|
TID_NULL = 0
|
||||||
|
|
|
@ -15,9 +15,9 @@ except ImportError:
|
||||||
from StringIO import StringIO
|
from StringIO import StringIO
|
||||||
|
|
||||||
try:
|
try:
|
||||||
import ion
|
|
||||||
except:
|
|
||||||
from calibre_plugins.dedrm import ion
|
from calibre_plugins.dedrm import ion
|
||||||
|
except ImportError:
|
||||||
|
import ion
|
||||||
|
|
||||||
|
|
||||||
__license__ = 'GPL v3'
|
__license__ = 'GPL v3'
|
||||||
|
|
Loading…
Reference in a new issue