Propagate changes

This commit is contained in:
Zhuoyun Wei 2018-04-18 04:58:45 -04:00
parent 4f1e9fcf43
commit 12ce977d79
No known key found for this signature in database
GPG key ID: AE9C22168EBA0BDB
4 changed files with 18 additions and 10 deletions

View file

@ -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

View file

@ -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'

View file

@ -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

View file

@ -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'