From a3cc22193251b1825e80248c88039b43f207feec Mon Sep 17 00:00:00 2001 From: penenkel <7736404+penenkel@users.noreply.github.com> Date: Wed, 2 Dec 2020 22:36:29 +0100 Subject: [PATCH] Revert changes to k4mobidedrm.py --- DeDRM_plugin/k4mobidedrm.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/DeDRM_plugin/k4mobidedrm.py b/DeDRM_plugin/k4mobidedrm.py index 6f49dbb..43392ee 100644 --- a/DeDRM_plugin/k4mobidedrm.py +++ b/DeDRM_plugin/k4mobidedrm.py @@ -228,10 +228,7 @@ def GetDecryptedBook(infile, kDatabases, androidFiles, serials, pids, starttime serials.extend(androidkindlekey.get_serials(aFile)) # extend PID list with book-specific PIDs from seriala and kDatabases md1, md2 = mb.getPIDMetaInfo() - bookspecific = kgenpids.getPidList(md1, md2, serials, kDatabases) - # kgenpids.getPidList returns each pid as a (mutable) bytearray - # conversion to (immutable) bytes is nessesary as otherwise the set() function below will fail - totalpids.extend((bytes(pid) for pid in bookspecific)) + totalpids.extend(kgenpids.getPidList(md1, md2, serials, kDatabases)) # remove any duplicates totalpids = list(set(totalpids)) print("Found {1:d} keys to try after {0:.1f} seconds".format(time.time()-starttime, len(totalpids)))