From ae806f734e7387d813a88c403a7bdc213de88c6a Mon Sep 17 00:00:00 2001 From: Aldo Bleeker Date: Sun, 29 Nov 2020 13:39:04 +0100 Subject: [PATCH 1/2] Python 3 fixes for __init__.py --- DeDRM_plugin/__init__.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/DeDRM_plugin/__init__.py b/DeDRM_plugin/__init__.py index b27fde9..79dabef 100644 --- a/DeDRM_plugin/__init__.py +++ b/DeDRM_plugin/__init__.py @@ -77,7 +77,7 @@ Decrypt DRMed ebooks. """ PLUGIN_NAME = "DeDRM" -PLUGIN_VERSION_TUPLE = tuple([int(x) for x in __version__.split(".")]) +PLUGIN_VERSION_TUPLE = (7, 0, 0) PLUGIN_VERSION = ".".join([str(x)for x in PLUGIN_VERSION_TUPLE]) # Include an html helpfile in the plugin's zipfile with the following name. RESOURCE_NAME = PLUGIN_NAME + '_Help.htm' @@ -421,7 +421,7 @@ class DeDRM(FileTypePlugin): # Attempt to decrypt epub with each encryption key (generated or provided). print("{0} v{1}: {2} is a PDF ebook".format(PLUGIN_NAME, PLUGIN_VERSION, os.path.basename(path_to_ebook))) for keyname, userkeyhex in dedrmprefs['adeptkeys'].items(): - userkey = userkeyhex.decode('hex') + userkey = codecs.decode(userkeyhex,'hex') print("{0} v{1}: Trying Encryption key {2:s}".format(PLUGIN_NAME, PLUGIN_VERSION, keyname)) of = self.temporary_file(".pdf") @@ -467,7 +467,7 @@ class DeDRM(FileTypePlugin): newkeys = [] for keyvalue in defaultkeys: - if keyvalue.encode('hex') not in dedrmprefs['adeptkeys'].values(): + if codecs.encode(keyvalue,'hex') not in dedrmprefs['adeptkeys'].values(): newkeys.append(keyvalue) if len(newkeys) > 0: @@ -491,7 +491,7 @@ class DeDRM(FileTypePlugin): # Store the new successful key in the defaults print("{0} v{1}: Saving a new default key".format(PLUGIN_NAME, PLUGIN_VERSION)) try: - dedrmprefs.addnamedvaluetoprefs('adeptkeys','default_key',keyvalue.encode('hex')) + dedrmprefs.addnamedvaluetoprefs('adeptkeys','default_key',codecs.encode(keyvalue,'hex')) dedrmprefs.writeprefs() print("{0} v{1}: Saved a new default key after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION,time.time()-self.starttime)) except: @@ -596,7 +596,7 @@ class DeDRM(FileTypePlugin): of = self.temporary_file(".pmlz") # Give the userkey, ebook and TemporaryPersistent file to the decryption function. - result = erdr2pml.decryptBook(path_to_ebook, of.name, True, userkey.decode('hex')) + result = erdr2pml.decryptBook(path_to_ebook, of.name, True, codecs.decode(userkey,'hex')) of.close() From 8e436ad9204665412774528f0d81b8a350bbf04a Mon Sep 17 00:00:00 2001 From: Aldo Bleeker Date: Sun, 29 Nov 2020 16:54:45 +0100 Subject: [PATCH 2/2] Python 3 fixes fort correct version of __init__.py --- DeDRM_plugin/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DeDRM_plugin/__init__.py b/DeDRM_plugin/__init__.py index 79dabef..cb981d8 100644 --- a/DeDRM_plugin/__init__.py +++ b/DeDRM_plugin/__init__.py @@ -77,7 +77,7 @@ Decrypt DRMed ebooks. """ PLUGIN_NAME = "DeDRM" -PLUGIN_VERSION_TUPLE = (7, 0, 0) +PLUGIN_VERSION_TUPLE = tuple([int(x) for x in __version__.split(".")]) PLUGIN_VERSION = ".".join([str(x)for x in PLUGIN_VERSION_TUPLE]) # Include an html helpfile in the plugin's zipfile with the following name. RESOURCE_NAME = PLUGIN_NAME + '_Help.htm'