polyfile-weave 0.5.5__py3-none-any.whl → 0.5.7__py3-none-any.whl

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/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")
-    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")[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.5.dist-info → polyfile_weave-0.5.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: polyfile-weave
-Version: 0.5.5
+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.5.dist-info → polyfile_weave-0.5.7.dist-info}/RECORD

@@ -14,9 +14,9 @@ polyfile/logger.py,sha256=i2JYOYTQX4TQPYXeHx9JQ3r9VKfSy6E8CIjUMdcREBo,3979
 polyfile/magic.py,sha256=271GCWrfgFIs0FRNIrCwsVc4LQXX1SXa9kHWJPyPkZM,117748
 polyfile/nes.py,sha256=I_yvW1iboEbPy4RP15eYVk9CVnKjwCQnchR6ahrd5tc,3933
 polyfile/nitf.py,sha256=1GbylAnWEV6OgkblEjIsnSM0XRd3uoa3ZF-ra_E_81M,589
-polyfile/pdf.py,sha256=alJgVaczZT1lB7f-MFHfioBcdBDQpFg_3kFlTToD88Y,46929
+polyfile/pdf.py,sha256=cCB1EnuGZvsHV64QtGWLRYqp01-lG0n9LWlopHlJUss,48817
 polyfile/pickles.py,sha256=4QElNrwW_kcmmKVvDT66KSVu7IUzplmvh6Nkqa_AWTg,1932
-polyfile/polyfile.py,sha256=pRNZzod4VMsFHD5E97hDmNiZ_32kNAOXrNpN8HbpaFM,14716
+polyfile/polyfile.py,sha256=g-Rmt7b2PlvSiVmOC1q-7WWA_w3xE_ReKRBE-XSRvSY,15009
 polyfile/profiling.py,sha256=rnJDZQo9qWdBwOkGBbcn85jEOuMA8HZDHR1fyEHvKvM,3694
 polyfile/repl.py,sha256=xnI9mnX3GpsWAqLhgij9Wk8WCBcO_khFJa0bDX_nJtk,24132
 polyfile/search.py,sha256=cRixN3aAXQUifFLopTcXAwN_IKdcwVEAzAk7slwb5Eo,9837
@@ -572,14 +572,14 @@ polyfile/templates/hexdump.css,sha256=UyvMxUcPwO8FLZofGfsuD7OLxseSaAXtdE5ZgqJnl-
 polyfile/templates/hexdump.js,sha256=mg-wAVj9FR8-h1FDNlFGh5QSdOSGb-Boefj8OZ9TiYs,22917
 polyfile/templates/jquery-3.4.1.min.js,sha256=CSXorXvZcTkaix6Yvo6HppcZGetbYMGWSFlBw8HfCJo,88145
 polyfile/templates/template.html,sha256=x_njCp9XFPmeealSBgcn0onDcMkkpGR0hrgUWXPFElo,4226
-polyfile_weave-0.5.5.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+polyfile_weave-0.5.7.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
 polymerge/__init__.py,sha256=nBpeA5mhu-ZtHRp4AtT5TRucLakHz8_ZC-kgmtmaHO0,28
 polymerge/__main__.py,sha256=n5M3RPFcFN30bn0HF0BeR2t6qIQh7WchIEifcpOVDcw,13261
 polymerge/cfg.py,sha256=8Tq0VkaxARZuXSDLdB5ljSpPffL_5WnGrKzUQymfygs,4293
 polymerge/polymerge.py,sha256=Kz_KqpA7jGzbsIzUiN9WUYa-KtS3Kdi7rkB8Wy40eBI,8357
 polymerge/polytracker.py,sha256=MoeiXDDfHOUy8kuylba6po6v-xRhwRCOsf8rR7aYk8o,6866
-polyfile_weave-0.5.5.dist-info/METADATA,sha256=MmwnKibJBjU8hTgBLQDEnIAG1FyqbD9sxDGjzPk_6pU,7588
-polyfile_weave-0.5.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-polyfile_weave-0.5.5.dist-info/entry_points.txt,sha256=aYTDT8rTusiriW6Gla03D8akWAtEgG3bKAoeIXW4AMU,52
-polyfile_weave-0.5.5.dist-info/top_level.txt,sha256=FXJ-FLNEQcq_ZX7bp4aQq3hSAC1KoLFCb019q2D3XQQ,19
-polyfile_weave-0.5.5.dist-info/RECORD,,
+polyfile_weave-0.5.7.dist-info/METADATA,sha256=x4S6mkqVFVAv20yjUXegbyGeVOcdcGDzQ5Izh7qm2I4,7588
+polyfile_weave-0.5.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+polyfile_weave-0.5.7.dist-info/entry_points.txt,sha256=aYTDT8rTusiriW6Gla03D8akWAtEgG3bKAoeIXW4AMU,52
+polyfile_weave-0.5.7.dist-info/top_level.txt,sha256=FXJ-FLNEQcq_ZX7bp4aQq3hSAC1KoLFCb019q2D3XQQ,19
+polyfile_weave-0.5.7.dist-info/RECORD,,