More Python2 fixes
This commit is contained in:
parent
d388ae72fd
commit
53996cf49c
|
@ -15,6 +15,6 @@ if "calibre" in sys.modules and sys.version_info[0] == 2:
|
||||||
sys.path.insert(0, os.path.join(config_dir, "plugins", "DeDRM.zip"))
|
sys.path.insert(0, os.path.join(config_dir, "plugins", "DeDRM.zip"))
|
||||||
|
|
||||||
# Explicitly set the package identifier so we are allowed to import stuff ...
|
# Explicitly set the package identifier so we are allowed to import stuff ...
|
||||||
#__package__ = "DeDRM_plugin"
|
__package__ = "calibre_plugins.dedrm"
|
||||||
|
|
||||||
#@@CALIBRE_COMPAT_CODE_END@@
|
#@@CALIBRE_COMPAT_CODE_END@@
|
||||||
|
|
|
@ -46,8 +46,8 @@ from base64 import b64decode
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
from utilities import SafeUnbuffered
|
from .utilities import SafeUnbuffered
|
||||||
from argv_utils import unicode_argv
|
from .argv_utils import unicode_argv
|
||||||
|
|
||||||
|
|
||||||
try:
|
try:
|
||||||
|
|
|
@ -29,7 +29,7 @@ from calibre.constants import iswindows, isosx
|
||||||
|
|
||||||
from __init__ import PLUGIN_NAME, PLUGIN_VERSION
|
from __init__ import PLUGIN_NAME, PLUGIN_VERSION
|
||||||
from __version import RESOURCE_NAME as help_file_name
|
from __version import RESOURCE_NAME as help_file_name
|
||||||
from utilities import uStrCmp
|
from .utilities import uStrCmp
|
||||||
|
|
||||||
import prefs
|
import prefs
|
||||||
import androidkindlekey
|
import androidkindlekey
|
||||||
|
|
|
@ -53,12 +53,12 @@ import sys, struct, os, traceback
|
||||||
import zlib
|
import zlib
|
||||||
import zipfile
|
import zipfile
|
||||||
import xml.etree.ElementTree as etree
|
import xml.etree.ElementTree as etree
|
||||||
from argv_utils import unicode_argv
|
from .argv_utils import unicode_argv
|
||||||
|
|
||||||
NSMAP = {'adept': 'http://ns.adobe.com/adept',
|
NSMAP = {'adept': 'http://ns.adobe.com/adept',
|
||||||
'enc': 'http://www.w3.org/2001/04/xmlenc#'}
|
'enc': 'http://www.w3.org/2001/04/xmlenc#'}
|
||||||
|
|
||||||
from utilities import SafeUnbuffered
|
from .utilities import SafeUnbuffered
|
||||||
|
|
||||||
|
|
||||||
_FILENAME_LEN_OFFSET = 26
|
_FILENAME_LEN_OFFSET = 26
|
||||||
|
|
|
@ -79,11 +79,8 @@ except ImportError:
|
||||||
|
|
||||||
#@@CALIBRE_COMPAT_CODE@@
|
#@@CALIBRE_COMPAT_CODE@@
|
||||||
|
|
||||||
try:
|
from .utilities import SafeUnbuffered
|
||||||
from utilities import SafeUnbuffered
|
from .argv_utils import unicode_argv
|
||||||
from argv_utils import unicode_argv
|
|
||||||
except:
|
|
||||||
from . import utilities, argv_utils
|
|
||||||
|
|
||||||
iswindows = sys.platform.startswith('win')
|
iswindows = sys.platform.startswith('win')
|
||||||
isosx = sys.platform.startswith('darwin')
|
isosx = sys.platform.startswith('darwin')
|
||||||
|
|
|
@ -50,9 +50,9 @@ try:
|
||||||
except ImportError:
|
except ImportError:
|
||||||
from Crypto.Cipher import AES
|
from Crypto.Cipher import AES
|
||||||
|
|
||||||
from utilities import SafeUnbuffered
|
from .utilities import SafeUnbuffered
|
||||||
|
|
||||||
from argv_utils import unicode_argv
|
from .argv_utils import unicode_argv
|
||||||
|
|
||||||
class IGNOBLEError(Exception):
|
class IGNOBLEError(Exception):
|
||||||
pass
|
pass
|
||||||
|
|
|
@ -27,14 +27,14 @@ import hashlib
|
||||||
import getopt
|
import getopt
|
||||||
import re
|
import re
|
||||||
|
|
||||||
from utilities import SafeUnbuffered
|
from .utilities import SafeUnbuffered
|
||||||
|
|
||||||
try:
|
try:
|
||||||
from calibre.constants import iswindows
|
from calibre.constants import iswindows
|
||||||
except:
|
except:
|
||||||
iswindows = sys.platform.startswith('win')
|
iswindows = sys.platform.startswith('win')
|
||||||
|
|
||||||
from argv_utils import unicode_argv
|
from .argv_utils import unicode_argv
|
||||||
|
|
||||||
class DrmException(Exception):
|
class DrmException(Exception):
|
||||||
pass
|
pass
|
||||||
|
|
|
@ -70,9 +70,8 @@ def unpad(data, padding=16):
|
||||||
|
|
||||||
return data[:-pad_len]
|
return data[:-pad_len]
|
||||||
|
|
||||||
from utilities import SafeUnbuffered
|
from .utilities import SafeUnbuffered
|
||||||
|
from .argv_utils import unicode_argv
|
||||||
from argv_utils import unicode_argv
|
|
||||||
|
|
||||||
|
|
||||||
class ADEPTError(Exception):
|
class ADEPTError(Exception):
|
||||||
|
|
|
@ -93,12 +93,12 @@ def unpad(data, padding=16):
|
||||||
return data[:-pad_len]
|
return data[:-pad_len]
|
||||||
|
|
||||||
|
|
||||||
from utilities import SafeUnbuffered
|
from .utilities import SafeUnbuffered
|
||||||
|
|
||||||
iswindows = sys.platform.startswith('win')
|
iswindows = sys.platform.startswith('win')
|
||||||
isosx = sys.platform.startswith('darwin')
|
isosx = sys.platform.startswith('darwin')
|
||||||
|
|
||||||
from argv_utils import unicode_argv
|
from .argv_utils import unicode_argv
|
||||||
|
|
||||||
class ADEPTError(Exception):
|
class ADEPTError(Exception):
|
||||||
pass
|
pass
|
||||||
|
|
|
@ -88,9 +88,9 @@ import kgenpids
|
||||||
import androidkindlekey
|
import androidkindlekey
|
||||||
import kfxdedrm
|
import kfxdedrm
|
||||||
|
|
||||||
from utilities import SafeUnbuffered
|
from .utilities import SafeUnbuffered
|
||||||
|
|
||||||
from argv_utils import unicode_argv
|
from .argv_utils import unicode_argv
|
||||||
|
|
||||||
|
|
||||||
# cleanup unicode filenames
|
# cleanup unicode filenames
|
||||||
|
|
|
@ -62,11 +62,8 @@ except NameError:
|
||||||
|
|
||||||
# Routines common to Mac and PC
|
# Routines common to Mac and PC
|
||||||
|
|
||||||
try:
|
from .utilities import SafeUnbuffered
|
||||||
from utilities import SafeUnbuffered
|
from .argv_utils import unicode_argv
|
||||||
from argv_utils import unicode_argv
|
|
||||||
except:
|
|
||||||
from . import utilities, argv_utils
|
|
||||||
|
|
||||||
|
|
||||||
try:
|
try:
|
||||||
|
|
|
@ -16,17 +16,17 @@
|
||||||
import sys
|
import sys
|
||||||
import binascii
|
import binascii
|
||||||
|
|
||||||
from utilities import SafeUnbuffered
|
from .utilities import SafeUnbuffered
|
||||||
|
|
||||||
from argv_utils import unicode_argv
|
from .argv_utils import unicode_argv
|
||||||
|
|
||||||
letters = 'ABCDEFGHIJKLMNPQRSTUVWXYZ123456789'
|
letters = b'ABCDEFGHIJKLMNPQRSTUVWXYZ123456789'
|
||||||
|
|
||||||
def crc32(s):
|
def crc32(s):
|
||||||
return (~binascii.crc32(s,-1))&0xFFFFFFFF
|
return (~binascii.crc32(s,-1))&0xFFFFFFFF
|
||||||
|
|
||||||
def checksumPid(s):
|
def checksumPid(s):
|
||||||
crc = crc32(s.encode('ascii'))
|
crc = crc32(s)
|
||||||
crc = crc ^ (crc >> 16)
|
crc = crc ^ (crc >> 16)
|
||||||
res = s
|
res = s
|
||||||
l = len(letters)
|
l = len(letters)
|
||||||
|
|
|
@ -80,11 +80,14 @@ import sys
|
||||||
import os
|
import os
|
||||||
import struct
|
import struct
|
||||||
import binascii
|
import binascii
|
||||||
from alfcrypto import Pukall_Cipher
|
|
||||||
|
|
||||||
from utilities import SafeUnbuffered
|
|
||||||
|
|
||||||
from argv_utils import unicode_argv
|
#@@CALIBRE_COMPAT_CODE@@
|
||||||
|
|
||||||
|
|
||||||
|
from .alfcrypto import Pukall_Cipher
|
||||||
|
from .utilities import SafeUnbuffered
|
||||||
|
from .argv_utils import unicode_argv
|
||||||
|
|
||||||
|
|
||||||
class DrmException(Exception):
|
class DrmException(Exception):
|
||||||
|
@ -103,10 +106,17 @@ def PC1(key, src, decryption=True):
|
||||||
except:
|
except:
|
||||||
raise
|
raise
|
||||||
|
|
||||||
# accepts unicode returns unicode
|
letters = b'ABCDEFGHIJKLMNPQRSTUVWXYZ123456789'
|
||||||
|
|
||||||
|
def crc32(s):
|
||||||
|
return (~binascii.crc32(s,-1))&0xFFFFFFFF
|
||||||
|
|
||||||
def checksumPid(s):
|
def checksumPid(s):
|
||||||
letters = 'ABCDEFGHIJKLMNPQRSTUVWXYZ123456789'
|
|
||||||
crc = (~binascii.crc32(s.encode('utf-8'),-1))&0xFFFFFFFF
|
s = s.encode()
|
||||||
|
|
||||||
|
|
||||||
|
crc = crc32(s)
|
||||||
crc = crc ^ (crc >> 16)
|
crc = crc ^ (crc >> 16)
|
||||||
res = s
|
res = s
|
||||||
l = len(letters)
|
l = len(letters)
|
||||||
|
@ -115,7 +125,7 @@ def checksumPid(s):
|
||||||
pos = (b // l) ^ (b % l)
|
pos = (b // l) ^ (b % l)
|
||||||
res += bytes(bytearray([letters[pos%l]]))
|
res += bytes(bytearray([letters[pos%l]]))
|
||||||
crc >>= 8
|
crc >>= 8
|
||||||
return res
|
return res.decode()
|
||||||
|
|
||||||
# expects bytearray
|
# expects bytearray
|
||||||
def getSizeOfTrailingDataEntries(ptr, size, flags):
|
def getSizeOfTrailingDataEntries(ptr, size, flags):
|
||||||
|
|
|
@ -24,10 +24,10 @@ import traceback
|
||||||
from struct import pack
|
from struct import pack
|
||||||
from struct import unpack
|
from struct import unpack
|
||||||
|
|
||||||
from alfcrypto import Topaz_Cipher
|
from .alfcrypto import Topaz_Cipher
|
||||||
from utilities import SafeUnbuffered
|
from .utilities import SafeUnbuffered
|
||||||
|
|
||||||
from argv_utils import unicode_argv
|
from .argv_utils import unicode_argv
|
||||||
|
|
||||||
|
|
||||||
#global switch
|
#global switch
|
||||||
|
|
Loading…
Reference in New Issue