Bunch of updates for the FileOpen script

noDRM · Dec 3, 2023 · 737d5e7 · 737d5e7 · ElleKayEm · Dec 3, 2023
1 parent e4e5808
commit 737d5e7
Show file tree

Hide file tree

Showing 3 changed files with 371 additions and 466 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -104,4 +104,5 @@ This is v10.0.9, a release candidate for v10.1.0. I don't expect there to be maj
 - Fix bugs in kgenpids.py, alfcrypto.py, mobidedrm.py and kindlekey.py that caused it to fail on Python 2 (#380).
 - Fix some bugs (Python 2 and Python 3) in erdr2pml.py (untested).
 - Fix file lock bug in androidkindlekey.py on Windows with Calibre >= 7 (untested).
+- A bunch of updates to the external FileOpen ineptpdf script, might fix #442 (untested).
 
diff --git a/DeDRM_plugin/ineptpdf.py b/DeDRM_plugin/ineptpdf.py
@@ -834,7 +834,7 @@ def num_value(x):
     x = resolve1(x)
     if not (isinstance(x, int) or isinstance(x, Decimal)):
         if STRICT:
-            raise PDFTypeError('Int or Float required: %r' % x)
+            raise PDFTypeError('Int or Decimal required: %r' % x)
         return 0
     return x
 
@@ -2042,7 +2042,7 @@ def read_xref(self):
         except PDFNoValidXRef:
             # fallback
             self.seek(0)
-            pat = re.compile(b'^(\\d+)\\s+(\\d+)\\s+obj\\b')
+            pat = re.compile(rb'^(\\d+)\\s+(\\d+)\\s+obj\\b')
             offsets = {}
             xref = PDFXRef()
             while 1: