Miroirs/DeDRM_tools
1
0
Fork 0
mirror of https://github.com/apprenticeharper/DeDRM_tools synced 2024-12-27 09:58:59 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1392 from penenkel/patch-1

Browse source 
Add conversion from bytearray to bytes so that pids are hashable
This commit is contained in:
Apprentice Harper 2020-12-04 12:51:26 +00:00 committed by GitHub
commit 92ea0a2f24
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
DeDRM_plugin/kgenpids.py
View file

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