Merge pull request #1398 from xxyzz/config

return str from load_resource()

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

DeDRM_plugin/config.py

@@ -175,7 +175,7 @@ class ConfigWidget(QWidget):
     def load_resource(self, name):
         with ZipFile(self.plugin_path, 'r') as zf:
             if name in zf.namelist():
-                return zf.read(name)
+                return zf.read(name).decode('utf-8')
         return ""
 
 

DeDRM_plugin/kgenpids.py

@@ -296,14 +296,14 @@ def getPidList(md1, md2, serials=[], kDatabases=[]):
 
     for kDatabase in kDatabases:
         try:
-            pidlst.extend(getK4Pids(md1, md2, kDatabase))
+            pidlst.extend(map(bytes,getK4Pids(md1, md2, kDatabase)))
         except Exception as e:
             print("Error getting PIDs from database {0}: {1}".format(kDatabase[0],e.args[0]))
             traceback.print_exc()
 
     for serialnum in serials:
         try:
-            pidlst.extend(getKindlePids(md1, md2, serialnum))
+            pidlst.extend(map(bytes,getKindlePids(md1, md2, serialnum)))
         except Exception as e:
             print("Error getting PIDs from serial number {0}: {1}".format(serialnum ,e.args[0]))
             traceback.print_exc()