]> xmof Git - DeDRM.git/commitdiff
`getPidList()` now returns pids as bytes instead of bytearrays
authorpenenkel <7736404+penenkel@users.noreply.github.com>
Wed, 2 Dec 2020 21:34:29 +0000 (22:34 +0100)
committerGitHub <noreply@github.com>
Wed, 2 Dec 2020 21:34:29 +0000 (22:34 +0100)
DeDRM_plugin/kgenpids.py

index 86ffab7f4da947179f019cae78c14a0f38894c64..98002547bdff58580e973da1631a0241ba890dca 100644 (file)
@@ -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()