From e4fe032e4719e87e004b2f36e433051bf3345b85 Mon Sep 17 00:00:00 2001 From: NoDRM Date: Sat, 19 Mar 2022 15:23:07 +0100 Subject: [PATCH] Some untested Python2 Kindle bugfixes --- DeDRM_plugin/k4mobidedrm.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/DeDRM_plugin/k4mobidedrm.py b/DeDRM_plugin/k4mobidedrm.py index ec108d4..e048a03 100644 --- a/DeDRM_plugin/k4mobidedrm.py +++ b/DeDRM_plugin/k4mobidedrm.py @@ -69,7 +69,11 @@ import getopt import re import traceback import time -import html.entities +try: + import html.entities as htmlentitydefs +except: + import htmlentitydefs + import json #@@CALIBRE_COMPAT_CODE@@ @@ -188,7 +192,7 @@ def unescape(text): else: # named entity try: - text = chr(html.entities.name2codepoint[text[1:-1]]) + text = chr(htmlentitydefs.name2codepoint[text[1:-1]]) except KeyError: pass return text # leave as is @@ -215,8 +219,11 @@ def GetDecryptedBook(infile, kDatabases, androidFiles, serials, pids, starttime else: mb = topazextract.TopazBook(infile) - bookname = unescape(mb.getBookTitle()) - print("Decrypting {1} ebook: {0}".format(bookname, mb.getBookType())) + try: + bookname = unescape(mb.getBookTitle()) + print("Decrypting {1} ebook: {0}".format(bookname, mb.getBookType())) + except: + print("Decrypting {0} ebook.".format(mb.getBookType())) # copy list of pids totalpids = list(pids)