polyfile-weave 0.5.6__tar.gz → 0.5.7__tar.gz

{polyfile_weave-0.5.6/polyfile_weave.egg-info → polyfile_weave-0.5.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: polyfile-weave
-Version: 0.5.6
+Version: 0.5.7
 Summary: A utility to recursively map the structure of a file.
 Home-page: https://github.com/zbirenbaum/polyfile-weave
 Author: Trail of Bits
@@ -24,7 +24,7 @@ Requires-Dist: intervaltree>=2.4.0
 Requires-Dist: jinja2>=2.1.0
 Requires-Dist: kaitaistruct~=0.10
 Requires-Dist: networkx>=2.6.3
-Requires-Dist: pdfminer.six<=20240706,>=20220524
+Requires-Dist: pdfminer.six<=20250506,>=20220524
 Requires-Dist: Pillow>=5.0.0
 Requires-Dist: pyreadline3; platform_system == "Windows"
 Requires-Dist: pyyaml>=3.13

{polyfile_weave-0.5.6 → polyfile_weave-0.5.7}/polyfile/pdf.py

@@ -5,19 +5,93 @@ import zlib
 from pdfminer.ascii85 import ascii85decode, asciihexdecode
 from pdfminer.ccitt import ccittfaxdecode
 from pdfminer.lzw import lzwdecode
-from pdfminer.pdfparser import PDFSyntaxError
-from pdfminer.pdftypes import PDFNotImplementedError
 from pdfminer.runlength import rldecode
-from pdfminer.pdfparser import PDFParser as PDFMinerParser, PDFStream, PDFObjRef
-from pdfminer.psparser import ExtraT, PSBaseParserToken, PSKeyword, PSObject, PSLiteral, PSStackEntry, PSSyntaxError
+
+# Core parser and exceptions that remain stable
+from pdfminer.pdfparser import PDFSyntaxError
+from pdfminer.pdfparser import PDFParser as PDFMinerParser
+
+# PDFStream and PDFObjRef moved from pdfminer.pdfparser -> pdfminer.pdftypes
+try:
+    from pdfminer.pdftypes import PDFStream, PDFObjRef  # new location
+except Exception:  # pragma: no cover - fallback for older pdfminer
+    from pdfminer.pdfparser import PDFStream, PDFObjRef  # old location
+
+# psparser symbols; KWD moved from pdfdocument -> psparser
+from pdfminer.psparser import (
+    ExtraT,
+    PSBaseParserToken,
+    PSKeyword,
+    PSObject,
+    PSLiteral,
+    PSStackEntry,
+    PSSyntaxError,
+)
+try:
+    from pdfminer.psparser import KWD  # new location
+except Exception:  # pragma: no cover
+    # old location
+    from pdfminer.pdfdocument import KWD
+
+# PSEOF moved from pdfdocument -> psexceptions
+try:
+    from pdfminer.psexceptions import PSEOF  # new location
+except Exception:  # pragma: no cover
+    from pdfminer.pdfdocument import PSEOF  # old location
+
+# dict_value moved from pdfdocument -> pdftypes
+try:
+    from pdfminer.pdftypes import dict_value  # new location
+except Exception:  # pragma: no cover
+    from pdfminer.pdfdocument import dict_value  # old location
+
+# DecipherCallable moved to pdftypes
+try:
+    from pdfminer.pdftypes import DecipherCallable  # new location
+except Exception:  # pragma: no cover
+    from pdfminer.pdfdocument import DecipherCallable  # old location
+
+# PDFObjectNotFound moved to pdfexceptions
+try:
+    from pdfminer.pdfexceptions import PDFObjectNotFound  # new location
+except Exception:  # pragma: no cover
+    from pdfminer.pdfdocument import PDFObjectNotFound  # old location
+
+# Keep other pdfdocument items that still exist there
 from pdfminer.pdfdocument import (
-    PDFDocument, PDFXRef, KWD, PDFNoValidXRef, PSEOF, dict_value, LITERAL_XREF, LITERAL_OBJSTM, LITERAL_CATALOG,
-    DecipherCallable, PDFObjectNotFound
+    PDFDocument,
+    PDFXRef,
+    PDFNoValidXRef,
+    LITERAL_XREF,
+    LITERAL_OBJSTM,
+    LITERAL_CATALOG,
 )
+
+# LIT moved from pdftypes -> psparser
+try:
+    from pdfminer.psparser import LIT  # new location
+except Exception:  # pragma: no cover
+    from pdfminer.pdftypes import LIT  # old location
+
+# apply_png_predictor moved from pdftypes -> utils
+try:
+    from pdfminer.utils import apply_png_predictor  # new location
+except Exception:  # pragma: no cover
+    from pdfminer.pdftypes import apply_png_predictor  # old location
+
+# Remaining pdftypes symbols
 from pdfminer.pdftypes import (
-    LIT, LITERALS_FLATE_DECODE, LITERALS_ASCIIHEX_DECODE, LITERALS_CCITTFAX_DECODE, LITERALS_RUNLENGTH_DECODE,
-    LITERAL_CRYPT, LITERALS_LZW_DECODE, LITERALS_DCT_DECODE, LITERALS_JBIG2_DECODE, LITERALS_ASCII85_DECODE,
-    int_value, apply_png_predictor
+    PDFNotImplementedError,
+    LITERALS_FLATE_DECODE,
+    LITERALS_ASCIIHEX_DECODE,
+    LITERALS_CCITTFAX_DECODE,
+    LITERALS_RUNLENGTH_DECODE,
+    LITERAL_CRYPT,
+    LITERALS_LZW_DECODE,
+    LITERALS_DCT_DECODE,
+    LITERALS_JBIG2_DECODE,
+    LITERALS_ASCII85_DECODE,
+    int_value,
 )
 
 from .fileutils import FileStream

{polyfile_weave-0.5.6 → polyfile_weave-0.5.7}/polyfile/polyfile.py

@@ -15,12 +15,19 @@ from . import logger
 from .magic import MagicMatcher, Match as MagicMatch, MatchContext, TestResult
 
 if sys.version_info >= (3, 10):
-    from importlib.metadata import version
-    __version__: str = version("polyfile_weave")
-    del version
+    from importlib.metadata import version, PackageNotFoundError
+    try:
+        __version__: str = version("polyfile_weave")
+    except PackageNotFoundError:
+        # Fallback for local, editable, or source-only usage without installed metadata
+        __version__ = "0.0.0-dev"
+    del version, PackageNotFoundError
 else:
     import pkg_resources
-    __version__ = pkg_resources.require("polyfile_weave")[0].version
+    try:
+        __version__ = pkg_resources.require("polyfile_weave")[0].version
+    except Exception:
+        __version__ = "0.0.0-dev"
     del pkg_resources
 mod_year = localtime(Path(__file__).stat().st_mtime).tm_year
 __copyright__: str = f"Copyright ©{mod_year} Trail of Bits"

{polyfile_weave-0.5.6 → polyfile_weave-0.5.7/polyfile_weave.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: polyfile-weave
-Version: 0.5.6
+Version: 0.5.7
 Summary: A utility to recursively map the structure of a file.
 Home-page: https://github.com/zbirenbaum/polyfile-weave
 Author: Trail of Bits
@@ -24,7 +24,7 @@ Requires-Dist: intervaltree>=2.4.0
 Requires-Dist: jinja2>=2.1.0
 Requires-Dist: kaitaistruct~=0.10
 Requires-Dist: networkx>=2.6.3
-Requires-Dist: pdfminer.six<=20240706,>=20220524
+Requires-Dist: pdfminer.six<=20250506,>=20220524
 Requires-Dist: Pillow>=5.0.0
 Requires-Dist: pyreadline3; platform_system == "Windows"
 Requires-Dist: pyyaml>=3.13

{polyfile_weave-0.5.6 → polyfile_weave-0.5.7}/polyfile_weave.egg-info/requires.txt

@@ -7,7 +7,7 @@ intervaltree>=2.4.0
 jinja2>=2.1.0
 kaitaistruct~=0.10
 networkx>=2.6.3
-pdfminer.six<=20240706,>=20220524
+pdfminer.six<=20250506,>=20220524
 Pillow>=5.0.0
 pyyaml>=3.13
 setuptools>=80.9.0

{polyfile_weave-0.5.6 → polyfile_weave-0.5.7}/setup.py

@@ -23,7 +23,7 @@ setup(
     long_description_content_type="text/markdown",
     url='https://github.com/zbirenbaum/polyfile-weave',
     author='Trail of Bits',
-    version="0.5.6",
+    version="0.5.7",
     packages=find_packages(exclude=("tests",)),
     python_requires='>=3.8',
     install_requires=[
@@ -36,7 +36,7 @@ setup(
         "jinja2>=2.1.0",
         "kaitaistruct~=0.10",
         "networkx>=2.6.3",
-        "pdfminer.six>=20220524,<=20240706",
+        "pdfminer.six>=20220524,<=20250506",
         "Pillow>=5.0.0",
         "pyreadline3;platform_system=='Windows'",
         "pyyaml>=3.13",