PyPDFForm 5.2.3__tar.gz → 5.2.4__tar.gz

{pypdfform-5.2.3 → pypdfform-5.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyPDFForm
-Version: 5.2.3
+Version: 5.2.4
 Summary: The Python library & CLI for PDF forms.
 Author: Jinge Li
 License-Expression: MIT

{pypdfform-5.2.3 → pypdfform-5.2.4}/PyPDFForm/__init__.py

@@ -18,7 +18,7 @@ from Python code or from the command line.
 
 import logging
 
-__version__ = "5.2.3"
+__version__ = "5.2.4"
 
 from .lib.annotations import Annotations
 from .lib.assets.blank import BlankPage

{pypdfform-5.2.3 → pypdfform-5.2.4}/PyPDFForm/lib/egress.py

@@ -6,19 +6,33 @@ This module provides functionalities that prepare the final PDF for output (egre
 ensuring that it is properly formatted and ready for the end-user. This includes
 managing appearance streams (so form fields display correctly after being filled),
 handling the /NeedAppearances flag, and preserving or updating document-level
-properties like metadata, title, and OpenAction scripts. These functions are typically
-called right before the final PDF byte stream is returned by the wrapper module.
+properties like metadata, title, and OpenAction scripts. It can also rebuild the
+AcroForm `/Fields` array from the widget annotations present on each page. These
+functions are typically called right before the final PDF byte stream is returned by
+the wrapper module.
 """
 
 from functools import lru_cache
 from io import BytesIO
-from warnings import catch_warnings, simplefilter
+from warnings import catch_warnings, filterwarnings
 
 from pikepdf import Pdf
 from pypdf import PdfReader, PdfWriter
-from pypdf.generic import DictionaryObject, NameObject, TextStringObject
-
-from .constants import JS, XFA, AcroForm, JavaScript, OpenAction, Root, S, Title
+from pypdf.generic import ArrayObject, DictionaryObject, NameObject, TextStringObject
+
+from .constants import (
+    JS,
+    XFA,
+    AcroForm,
+    Annots,
+    Fields,
+    JavaScript,
+    OpenAction,
+    Root,
+    S,
+    Title,
+)
+from .template import get_widget_key
 
 
 @lru_cache(maxsize=128)
@@ -58,12 +72,14 @@ def appearance_streams_handler(pdf: bytes, generate_appearance_streams: bool) ->
         result = f.read()
 
     if generate_appearance_streams:
-        # TODO: remove after fixing /Annots /Fields mismatch
         with Pdf.open(BytesIO(result)) as f, catch_warnings():
-            simplefilter("ignore")
+            filterwarnings(
+                "ignore", message=".*/AcroForm.*"
+            )  # handled by rebuild_acroform_fields
+
             f.generate_appearance_streams()
             with BytesIO() as r:
-                f.save(r)
+                f.save(r, deterministic_id=True)
                 r.seek(0)
                 result = r.read()
 
@@ -114,3 +130,50 @@ def preserve_pdf_properties(
         writer.write(f)
         f.seek(0)
         return f.read()
+
+
+def rebuild_acroform_fields(
+    pdf: bytes, widget_keys: set, use_full_widget_name: bool
+) -> bytes:
+    """
+    Rebuilds the AcroForm `/Fields` array from matching page annotations.
+
+    The existing `/Fields` array is replaced, creating an AcroForm dictionary
+    when necessary. Each page annotation is resolved to a widget key, and only
+    annotations whose keys are present in `widget_keys` are added to the new
+    array. Page annotation arrays are left unchanged. When no matching page
+    annotations are found, the original PDF stream is returned unchanged to
+    avoid an unnecessary rewrite.
+
+    Args:
+        pdf (bytes): The PDF stream whose AcroForm fields should be rebuilt.
+        widget_keys (set): Widget keys to include in the rebuilt `/Fields` array.
+        use_full_widget_name (bool): Whether to resolve annotations using their
+            full widget names, including parent names.
+
+    Returns:
+        bytes: The PDF stream with a rebuilt AcroForm `/Fields` array, or the
+            original stream when there are no matching widgets to rebuild.
+    """
+    writer = PdfWriter(BytesIO(pdf))
+    root = writer._root_object  # type: ignore # noqa: SLF001 # # pylint: disable=W0212
+
+    if AcroForm not in root:
+        root[NameObject(AcroForm)] = DictionaryObject({})
+    root[AcroForm][NameObject(Fields)] = ArrayObject([])
+
+    needs_update = False
+    for page in writer.pages:
+        for annot in page.get(Annots, []):
+            key = get_widget_key(annot.get_object(), use_full_widget_name)
+            if key in widget_keys:
+                root[AcroForm][Fields].append(annot)
+                needs_update = True
+
+    if not needs_update:
+        return pdf
+
+    with BytesIO() as f:
+        writer.write(f)
+        f.seek(0)
+        return f.read()

{pypdfform-5.2.3 → pypdfform-5.2.4}/PyPDFForm/lib/utils.py

@@ -21,7 +21,13 @@ from typing import Any, List
 from pypdf import PdfReader, PdfWriter
 from pypdf.generic import ArrayObject, DictionaryObject, NameObject
 
-from .constants import SLASH, UNIQUE_SUFFIX_LENGTH, Annots
+from .constants import (
+    SLASH,
+    UNIQUE_SUFFIX_LENGTH,
+    VERSION_IDENTIFIER_PREFIX,
+    VERSION_IDENTIFIERS,
+    Annots,
+)
 
 
 @lru_cache(maxsize=128)
@@ -329,3 +335,54 @@ def generate_unique_suffix() -> str:
             for _ in range(UNIQUE_SUFFIX_LENGTH)
         ]
     )
+
+
+def get_version(pdf: bytes) -> str | None:
+    """
+    Extracts the PDF header version from a byte stream.
+
+    The stream is checked against the supported PDF header identifiers defined
+    in constants. The function inspects the original bytes directly so callers
+    can capture a document's version before handing it to tools that may rewrite
+    the header during output processing.
+
+    Args:
+        pdf (bytes): The PDF stream to inspect.
+
+    Returns:
+        str | None: The PDF version string, or None when the stream does not
+            start with a known PDF version identifier.
+    """
+
+    result = None
+    for each in VERSION_IDENTIFIERS:
+        if pdf.startswith(each):
+            result = each.replace(VERSION_IDENTIFIER_PREFIX, b"").decode()
+            break
+
+    return result
+
+
+def set_version(pdf: bytes, old: str, new: str) -> bytes:
+    """
+    Replaces the first PDF header version marker in a byte stream.
+
+    This helper only changes the literal header marker, such as `%PDF-1.7`; it
+    does not validate or rewrite the document for version-specific feature
+    compatibility. It is used after egress rewrites so output keeps the wrapper's
+    cached version instead of inheriting a writer-selected version.
+
+    Args:
+        pdf (bytes): The PDF stream to update.
+        old (str): The currently present PDF version string.
+        new (str): The PDF version string to write into the header.
+
+    Returns:
+        bytes: The PDF stream with the first matching version marker replaced.
+    """
+
+    return pdf.replace(
+        VERSION_IDENTIFIER_PREFIX + bytes(old, "utf-8"),
+        VERSION_IDENTIFIER_PREFIX + bytes(new, "utf-8"),
+        1,
+    )

{pypdfform-5.2.3 → pypdfform-5.2.4}/PyPDFForm/lib/wrapper.py

@@ -37,9 +37,12 @@ from .adapter import (
     fp_or_f_obj_or_f_content_to_content,
     fp_or_f_obj_or_stream_to_stream,
 )
-from .constants import VERSION_IDENTIFIER_PREFIX, VERSION_IDENTIFIERS
 from .coordinate import generate_coordinate_grid
-from .egress import appearance_streams_handler, preserve_pdf_properties
+from .egress import (
+    appearance_streams_handler,
+    preserve_pdf_properties,
+    rebuild_acroform_fields,
+)
 from .filler import fill
 from .font import (
     get_all_available_fonts,
@@ -62,8 +65,10 @@ from .types import PdfArray
 from .utils import (
     generate_unique_suffix,
     get_page_streams,
+    get_version,
     merge_pdfs,
     remove_all_widgets,
+    set_version,
 )
 from .watermark import (
     copy_watermark_widgets,
@@ -144,12 +149,14 @@ class PdfWrapper:
         self._stream = fp_or_f_obj_or_stream_to_stream(template)
         self.widgets = {}
         self.title: Optional[str] = None
+
+        self._version = None
         self._metadata = (
             get_metadata(self._read()) if kwargs.get("preserve_metadata") else {}
         )
         self._on_open_javascript = None
         self._available_fonts = {}  # for setting /F1
-        self._available_fonts_loaded = False
+        self._available_fonts_loaded = None  # for lazy loading fonts
         self._font_register_events = []  # for reregister
         self._key_update_tracker = {}  # for update key preserve old key attrs
         self._keys_to_update = []  # for bulk update keys
@@ -221,8 +228,8 @@ class PdfWrapper:
         It rebuilds the widget dictionary and invalidates the lazily loaded font cache.
         """
 
-        stream = self._read()
         self._available_fonts_loaded = False
+        stream = self._read()
         new_widgets = (
             build_widgets(
                 stream,
@@ -363,15 +370,18 @@ class PdfWrapper:
         """
         Returns the PDF version of the underlying PDF document.
 
+        The version is read from the PDF header lazily and cached so egress-only
+        rewrites can restore the wrapper's original version even if an underlying
+        PDF writer emits a different default header.
+
         Returns:
             str | None: The PDF version as a string, or None if the version cannot be determined.
         """
 
-        for each in VERSION_IDENTIFIERS:
-            if self._read().startswith(each):
-                return each.replace(VERSION_IDENTIFIER_PREFIX, b"").decode()
+        if self._version is None:
+            self._version = get_version(self._read())
 
-        return None
+        return self._version
 
     @property
     def fonts(self) -> list:
@@ -452,6 +462,11 @@ class PdfWrapper:
            generating appearance streams.
         3. If `preserve_metadata`, title, or on-open JavaScript are set, it preserves
            or updates the corresponding PDF properties accordingly.
+        4. Rebuilds the AcroForm `/Fields` array from page annotations for
+           widgets known to this wrapper, leaving the stream unchanged when no
+           matching widget annotations are found.
+        5. Restores the wrapper's cached PDF header version after egress
+           processing, since PDF writers may emit their own default version.
         The wrapper's stored stream is not replaced by these final egress-only changes.
 
         Returns:
@@ -464,8 +479,15 @@ class PdfWrapper:
                 result, getattr(self, "generate_appearance_streams")
             )  # cached
 
-        if any(
-            [getattr(self, "preserve_metadata"), self.title, self.on_open_javascript]
+        if (
+            any(
+                [
+                    getattr(self, "preserve_metadata"),
+                    self.title,
+                    self.on_open_javascript,
+                ]
+            )
+            and result
         ):
             result = preserve_pdf_properties(
                 result,
@@ -474,6 +496,12 @@ class PdfWrapper:
                 self._metadata if getattr(self, "preserve_metadata") else None,
             )
 
+        if result:
+            result = rebuild_acroform_fields(
+                result, set(self.widgets.keys()), getattr(self, "use_full_widget_name")
+            )
+            if self.version:
+                result = set_version(result, get_version(result), self.version)
         return result
 
     def _read(self) -> bytes:
@@ -546,9 +574,9 @@ class PdfWrapper:
         """
         Changes the PDF version of the underlying document.
 
-        The method replaces the first PDF header version marker in the current stream.
-        It does not otherwise validate or rewrite the document for version-specific
-        compatibility.
+        The method replaces the first PDF header version marker in the current stream
+        and updates the cached version used by later egress processing. It does not
+        otherwise validate or rewrite the document for version-specific compatibility.
 
         Args:
             version (str): The new PDF version string (e.g., "1.7").
@@ -557,11 +585,9 @@ class PdfWrapper:
             PdfWrapper: The `PdfWrapper` object, allowing for method chaining.
         """
 
-        self._stream = self._read().replace(
-            VERSION_IDENTIFIER_PREFIX + bytes(self.version, "utf-8"),
-            VERSION_IDENTIFIER_PREFIX + bytes(version, "utf-8"),
-            1,
-        )
+        if self.version:
+            self._stream = set_version(self._read(), self.version, version)
+            self._version = version
 
         return self
 

{pypdfform-5.2.3 → pypdfform-5.2.4}/PyPDFForm.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyPDFForm
-Version: 5.2.3
+Version: 5.2.4
 Summary: The Python library & CLI for PDF forms.
 Author: Jinge Li
 License-Expression: MIT

{pypdfform-5.2.3 → pypdfform-5.2.4}/pyproject.toml

@@ -140,6 +140,6 @@ include = ["PyPDFForm*"]
 
 [tool.pytest.ini_options]
 markers = [
-    "posix_only", # mainly because of zlib vs zlib-ng
+    "requires_zlib_over_zlib_ng", # expected PDF streams differ when Python uses zlib-ng
     "cli_test",
 ]

{pypdfform-5.2.3 → pypdfform-5.2.4}/tests/test_bulk_create_fields.py

@@ -10,7 +10,7 @@ from PyPDFForm import BlankPage, Fields, PdfWrapper
 from PyPDFForm.lib.constants import Annots, Subtype, Widget
 
 
-@pytest.mark.posix_only
+@pytest.mark.requires_zlib_over_zlib_ng
 def test_bulk_create_fields_stress_max(pdf_samples, request):
     expected_path = os.path.join(
         pdf_samples, "bulk_create_fields", "test_bulk_create_fields_stress_max.pdf"
@@ -86,7 +86,7 @@ def test_bulk_create_fields_stress_max(pdf_samples, request):
         assert obj.read() == expected
 
 
-@pytest.mark.posix_only
+@pytest.mark.requires_zlib_over_zlib_ng
 def test_bulk_create_fields_stress_max_mixed(pdf_samples, request):
     expected_path = os.path.join(
         pdf_samples,

{pypdfform-5.2.3 → pypdfform-5.2.4}/tests/test_create_widget.py

@@ -7,7 +7,7 @@ import pytest
 from PyPDFForm import Fields, PdfWrapper
 
 
-@pytest.mark.posix_only
+@pytest.mark.requires_zlib_over_zlib_ng
 def test_create_checkbox_complex_fill(template_stream, pdf_samples, request):
     expected_path = os.path.join(
         pdf_samples, "widget", "test_create_checkbox_complex_fill.pdf"
@@ -42,7 +42,7 @@ def test_create_checkbox_complex_fill(template_stream, pdf_samples, request):
         assert obj.read() == expected
 
 
-@pytest.mark.posix_only
+@pytest.mark.requires_zlib_over_zlib_ng
 def test_create_checkbox_check_fill(template_stream, pdf_samples, request):
     expected_path = os.path.join(
         pdf_samples, "widget", "test_create_checkbox_check_fill.pdf"
@@ -70,7 +70,7 @@ def test_create_checkbox_check_fill(template_stream, pdf_samples, request):
         assert obj.read() == expected
 
 
-@pytest.mark.posix_only
+@pytest.mark.requires_zlib_over_zlib_ng
 def test_create_checkbox_circle_fill(template_stream, pdf_samples, request):
     expected_path = os.path.join(
         pdf_samples, "widget", "test_create_checkbox_circle_fill.pdf"
@@ -98,7 +98,7 @@ def test_create_checkbox_circle_fill(template_stream, pdf_samples, request):
         assert obj.read() == expected
 
 
-@pytest.mark.posix_only
+@pytest.mark.requires_zlib_over_zlib_ng
 def test_create_checkbox_cross_fill(template_stream, pdf_samples, request):
     expected_path = os.path.join(
         pdf_samples, "widget", "test_create_checkbox_cross_fill.pdf"
@@ -126,7 +126,7 @@ def test_create_checkbox_cross_fill(template_stream, pdf_samples, request):
         assert obj.read() == expected
 
 
-@pytest.mark.posix_only
+@pytest.mark.requires_zlib_over_zlib_ng
 def test_create_text_alpha_bg_color(template_stream, pdf_samples, request):
     expected_path = os.path.join(
         pdf_samples, "widget", "test_create_text_alpha_bg_color.pdf"
@@ -154,7 +154,7 @@ def test_create_text_alpha_bg_color(template_stream, pdf_samples, request):
         assert obj.read() == expected
 
 
-@pytest.mark.posix_only
+@pytest.mark.requires_zlib_over_zlib_ng
 def test_create_text_align_center(template_stream, pdf_samples, request):
     expected_path = os.path.join(
         pdf_samples, "widget", "test_create_text_align_center.pdf"
@@ -182,7 +182,7 @@ def test_create_text_align_center(template_stream, pdf_samples, request):
         assert obj.read() == expected
 
 
-@pytest.mark.posix_only
+@pytest.mark.requires_zlib_over_zlib_ng
 def test_create_text_multiline(template_stream, pdf_samples, request):
     expected_path = os.path.join(
         pdf_samples, "widget", "test_create_text_align_multiline.pdf"
@@ -210,7 +210,7 @@ def test_create_text_multiline(template_stream, pdf_samples, request):
         assert obj.read() == expected
 
 
-@pytest.mark.posix_only
+@pytest.mark.requires_zlib_over_zlib_ng
 def test_create_text_complex_filled(
     template_stream, pdf_samples, sample_font_stream, request
 ):
@@ -252,7 +252,7 @@ def test_create_text_complex_filled(
         assert obj.read() == expected
 
 
-@pytest.mark.posix_only
+@pytest.mark.requires_zlib_over_zlib_ng
 def test_create_text_comb(template_stream, pdf_samples, request):
     expected_path = os.path.join(pdf_samples, "widget", "test_create_text_comb.pdf")
     with open(expected_path, "rb+") as f:
@@ -278,7 +278,7 @@ def test_create_text_comb(template_stream, pdf_samples, request):
         assert obj.read() == expected
 
 
-@pytest.mark.posix_only
+@pytest.mark.requires_zlib_over_zlib_ng
 def test_create_checkbox_persist_old_widgets_fill(
     template_stream, pdf_samples, request
 ):
@@ -310,7 +310,7 @@ def test_create_checkbox_persist_old_widgets_fill(
         assert obj.read() == expected
 
 
-@pytest.mark.posix_only
+@pytest.mark.requires_zlib_over_zlib_ng
 def test_create_widget_sejda_fill_flatten_before(sejda_template, pdf_samples, request):
     expected_path = os.path.join(
         pdf_samples, "widget", "test_create_widget_sejda_fill_flatten_before.pdf"
@@ -344,7 +344,7 @@ def test_create_widget_sejda_fill_flatten_before(sejda_template, pdf_samples, re
         assert obj.read() == expected
 
 
-@pytest.mark.posix_only
+@pytest.mark.requires_zlib_over_zlib_ng
 def test_create_widget_sejda_fill_flatten_after(sejda_template, pdf_samples, request):
     expected_path = os.path.join(
         pdf_samples, "widget", "test_create_widget_sejda_fill_flatten_after.pdf"
@@ -422,7 +422,7 @@ def test_fill_cmyk_color(pdf_samples, request):
         assert obj.read() == expected
 
 
-@pytest.mark.posix_only
+@pytest.mark.requires_zlib_over_zlib_ng
 def test_create_radio_complex(template_stream, pdf_samples, request):
     expected_path = os.path.join(pdf_samples, "widget", "test_create_radio_complex.pdf")
     with open(expected_path, "rb+") as f:
@@ -454,7 +454,7 @@ def test_create_radio_complex(template_stream, pdf_samples, request):
         assert obj.read() == expected
 
 
-@pytest.mark.posix_only
+@pytest.mark.requires_zlib_over_zlib_ng
 def test_create_required_fields(pdf_samples, request):
     expected_path = os.path.join(
         pdf_samples, "widget", "test_create_required_fields.pdf"
@@ -505,7 +505,7 @@ def test_create_required_fields(pdf_samples, request):
         assert obj.read() == expected
 
 
-@pytest.mark.posix_only
+@pytest.mark.requires_zlib_over_zlib_ng
 def test_create_not_required_fields(pdf_samples, request):
     expected_path = os.path.join(
         pdf_samples, "widget", "test_create_not_required_fields.pdf"
@@ -556,7 +556,7 @@ def test_create_not_required_fields(pdf_samples, request):
         assert obj.read() == expected
 
 
-@pytest.mark.posix_only
+@pytest.mark.requires_zlib_over_zlib_ng
 def test_create_fields_with_tooltips(pdf_samples, request):
     expected_path = os.path.join(
         pdf_samples, "widget", "test_create_fields_with_tooltips.pdf"

{pypdfform-5.2.3 → pypdfform-5.2.4}/tests/test_draw_elements.py

@@ -142,7 +142,7 @@ def test_draw_image_on_sejda_template(
         assert obj.read() == expected
 
 
-@pytest.mark.posix_only
+@pytest.mark.requires_zlib_over_zlib_ng
 def test_draw_png_image_on_one_page(
     template_stream, image_samples, pdf_samples, request
 ):
@@ -169,7 +169,7 @@ def test_draw_png_image_on_one_page(
         assert obj.read() == expected
 
 
-@pytest.mark.posix_only
+@pytest.mark.requires_zlib_over_zlib_ng
 def test_draw_transparent_png_image_on_one_page(
     template_stream, image_samples, pdf_samples, request
 ):

{pypdfform-5.2.3 → pypdfform-5.2.4}/tests/test_dropdown.py

@@ -65,7 +65,7 @@ def test_dropdown_one_flatten(sample_template_with_dropdown, pdf_samples, reques
         assert obj.read() == expected
 
 
-@pytest.mark.posix_only
+@pytest.mark.requires_zlib_over_zlib_ng
 def test_dropdown_alignment(dropdown_alignment, pdf_samples, request):
     expected_path = os.path.join(pdf_samples, "dropdown", "test_dropdown_alignment.pdf")
     with open(expected_path, "rb+") as f:
@@ -86,7 +86,7 @@ def test_dropdown_alignment(dropdown_alignment, pdf_samples, request):
         assert obj.read() == expected
 
 
-@pytest.mark.posix_only
+@pytest.mark.requires_zlib_over_zlib_ng
 def test_dropdown_alignment_flatten_then_unflatten(
     dropdown_alignment, pdf_samples, request
 ):

{pypdfform-5.2.3 → pypdfform-5.2.4}/tests/test_functional.py

@@ -5,12 +5,22 @@ from io import BytesIO
 
 import pytest
 from jsonschema import ValidationError, validate
+from pypdf import PdfReader
 
 from PyPDFForm import Annotations, BlankPage, Fields, PdfArray, PdfWrapper
-from PyPDFForm.lib.constants import DA, UNIQUE_SUFFIX_LENGTH, T, V
+from PyPDFForm.lib.constants import (
+    DA,
+    UNIQUE_SUFFIX_LENGTH,
+    AcroForm,
+    T,
+    V,
+)
+from PyPDFForm.lib.constants import (
+    Fields as FieldsConst,
+)
 from PyPDFForm.lib.deprecation import deprecation_notice
 from PyPDFForm.lib.middleware.base import Widget
-from PyPDFForm.lib.template import get_widgets_by_page
+from PyPDFForm.lib.template import get_widget_key, get_widgets_by_page
 
 
 def test_deprecation_warning():
@@ -95,9 +105,9 @@ def test_base_schema_definition():
     assert Widget("foo").schema_definition == {}
 
 
-def test_write(template_stream, pdf_samples):
+def test_write(template_stream, tmp_path):
     assert PdfWrapper(template_stream).write(
-        os.path.join(pdf_samples, "sample_template.pdf")
+        os.path.join(tmp_path, "sample_template.pdf")
     )
 
 
@@ -106,7 +116,7 @@ def test_write_io(template_stream):
     PdfWrapper(template_stream).write(buff)
     buff.seek(0)
 
-    assert buff.read() == template_stream
+    assert buff.read()
 
 
 def test_fill_flatten_then_unflatten(template_stream, pdf_samples, data_dict, request):
@@ -135,7 +145,7 @@ def test_register_bad_fonts():
     assert "foo" not in obj.fonts
 
 
-@pytest.mark.posix_only
+@pytest.mark.requires_zlib_over_zlib_ng
 def test_fill_with_customized_widgets(
     template_stream, pdf_samples, sample_font_stream, data_dict, request
 ):
@@ -165,7 +175,7 @@ def test_fill_with_customized_widgets(
         assert obj.read() == expected
 
 
-@pytest.mark.posix_only
+@pytest.mark.requires_zlib_over_zlib_ng
 def test_fill_with_customized_widgets_flatten(
     template_stream, pdf_samples, sample_font_stream, data_dict, request
 ):
@@ -497,9 +507,10 @@ def test_version(pdf_samples):
 
     obj = PdfWrapper(os.path.join(pdf_samples, "versions", "unknown.pdf"))
     assert obj.version is None
+    assert obj.read()
 
 
-@pytest.mark.posix_only
+@pytest.mark.requires_zlib_over_zlib_ng
 def test_fill_font_color(sample_template_with_font_colors, pdf_samples, request):
     expected_path = os.path.join(pdf_samples, "test_fill_font_color.pdf")
     with open(expected_path, "rb+") as f:
@@ -521,7 +532,7 @@ def test_fill_font_color(sample_template_with_font_colors, pdf_samples, request)
         assert obj.read() == expected
 
 
-@pytest.mark.posix_only
+@pytest.mark.requires_zlib_over_zlib_ng
 def test_fill_complex_fonts(sample_template_with_complex_fonts, pdf_samples, request):
     expected_path = os.path.join(pdf_samples, "test_fill_complex_fonts.pdf")
     with open(expected_path, "rb+") as f:
@@ -551,7 +562,7 @@ def test_fill_complex_fonts(sample_template_with_complex_fonts, pdf_samples, req
         assert obj.read() == expected
 
 
-@pytest.mark.posix_only
+@pytest.mark.requires_zlib_over_zlib_ng
 def test_pages_preserve_font(template_stream, pdf_samples, sample_font_stream, request):
     expected_path = os.path.join(pdf_samples, "pages", "test_pages_preserve_font.pdf")
     obj = PdfWrapper(template_stream)
@@ -703,7 +714,7 @@ def test_uncheck_checkbox(pdf_samples, request):
         assert obj.read() == expected
 
 
-@pytest.mark.posix_only
+@pytest.mark.requires_zlib_over_zlib_ng
 def test_blank_page(pdf_samples, request):
     expected_path = os.path.join(pdf_samples, "test_blank_page.pdf")
     with open(expected_path, "rb+") as f:
@@ -718,7 +729,7 @@ def test_blank_page(pdf_samples, request):
         request.config.results["skip_regenerate"] = len(obj.read()) == len(expected)
 
 
-@pytest.mark.posix_only
+@pytest.mark.requires_zlib_over_zlib_ng
 def test_blank_page_custom_size_multiply(pdf_samples, request):
     expected_path = os.path.join(
         pdf_samples, "test_blank_page_custom_size_multiply.pdf"
@@ -844,7 +855,7 @@ def test_remove_fields_update_widgets(template_stream):
 
 
 def test_remove_fields_no_keys_specified(template_stream):
-    assert PdfWrapper(template_stream).remove_fields([]).read() == template_stream
+    assert PdfWrapper(template_stream).remove_fields([]).read()
 
 
 def test_merge(template_stream):
@@ -1102,3 +1113,16 @@ def test_rubber_stamp_annotation(template_stream, pdf_samples, request):
 
         assert len(obj.read()) == len(expected)
         assert obj.read() == expected
+
+
+def test_rebuild_acroform_fields():
+    pdf = PdfWrapper(BlankPage() * 2)
+
+    pdf.bulk_create_fields(
+        [Fields.TextField("foo", 1, 100, 100), Fields.TextField("bar", 2, 100, 200)]
+    )
+
+    reader = PdfReader(BytesIO(pdf.read()))
+
+    assert get_widget_key(reader.root_object[AcroForm][FieldsConst][0], False) == "foo"
+    assert get_widget_key(reader.root_object[AcroForm][FieldsConst][1], False) == "bar"

{pypdfform-5.2.3 → pypdfform-5.2.4}/tests/test_generate_appearance_streams.py

@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# TODO: why does pikepdf randomize final streams?
 
 import os
 
@@ -24,7 +23,30 @@ def test_fill(template_stream, pdf_samples, data_dict, request):
         expected = f.read()
 
         assert len(obj.read()) == len(expected)
-        request.config.results["skip_regenerate"] = len(obj.read()) == len(expected)
+        assert obj.read() == expected
+
+
+def test_fill_sejda_complex(
+    sejda_template_complex, sejda_complex_data, pdf_samples, request
+):
+    expected_path = os.path.join(
+        pdf_samples,
+        "generate_appearance_streams",
+        "paragraph",
+        "sample_filled_sejda_complex.pdf",
+    )
+    with open(expected_path, "rb+") as f:
+        obj = PdfWrapper(sejda_template_complex, generate_appearance_streams=True).fill(
+            sejda_complex_data,
+        )
+
+        request.config.results["expected_path"] = expected_path
+        request.config.results["stream"] = obj.read()
+
+        expected = f.read()
+
+        assert len(obj.read()) == len(expected)
+        assert obj.read() == expected
 
 
 def test_dropdown_two(sample_template_with_dropdown, pdf_samples, request):
@@ -53,30 +75,7 @@ def test_dropdown_two(sample_template_with_dropdown, pdf_samples, request):
         expected = f.read()
 
         assert len(obj.read()) == len(expected)
-        request.config.results["skip_regenerate"] = len(obj.read()) == len(expected)
-
-
-def test_fill_sejda_complex(
-    sejda_template_complex, sejda_complex_data, pdf_samples, request
-):
-    expected_path = os.path.join(
-        pdf_samples,
-        "generate_appearance_streams",
-        "paragraph",
-        "sample_filled_sejda_complex.pdf",
-    )
-    with open(expected_path, "rb+") as f:
-        obj = PdfWrapper(sejda_template_complex, generate_appearance_streams=True).fill(
-            sejda_complex_data,
-        )
-
-        request.config.results["expected_path"] = expected_path
-        request.config.results["stream"] = obj.read()
-
-        expected = f.read()
-
-        assert len(obj.read()) == len(expected)
-        request.config.results["skip_regenerate"] = len(obj.read()) == len(expected)
+        assert obj.read() == expected
 
 
 def test_issue_613(pdf_samples, request):
@@ -100,10 +99,10 @@ def test_issue_613(pdf_samples, request):
         expected = f.read()
 
         assert len(obj.read()) == len(expected)
-        request.config.results["skip_regenerate"] = len(obj.read()) == len(expected)
+        assert obj.read() == expected
 
 
-@pytest.mark.posix_only
+@pytest.mark.requires_zlib_over_zlib_ng
 def test_sample_template_library(
     pdf_samples, image_samples, sample_font_stream, request
 ):

{pypdfform-5.2.3 → pypdfform-5.2.4}/tests/test_need_appearances.py

@@ -94,7 +94,9 @@ def run_sample_template_library_test(
 
         obj.widgets["new_text_field_widget"].font = "new_font"
         obj.widgets["new_text_field_widget"].font_color = (1, 0, 0)
-        # TODO: why is alignment not rendered right in the appearance stream?
+
+        # Currently alignment is not respected due to qpdf limitations
+        # https://github.com/qpdf/qpdf/blob/503d401615a842f7c5220a3ee425f5db2f25f537/TODO.md#text-appearance-streams
         obj.widgets["new_text_field_widget"].alignment = 2
 
         obj.widgets["new_checkbox_widget"].size = 40
@@ -106,10 +108,7 @@ def run_sample_template_library_test(
         expected = f.read()
 
         assert len(obj.read()) == len(expected)
-        if generate_appearance_streams:
-            request.config.results["skip_regenerate"] = len(obj.read()) == len(expected)
-        else:
-            assert obj.read() == expected
+        assert obj.read() == expected
 
 
 def test_fill(template_stream, pdf_samples, data_dict, request):
@@ -199,7 +198,7 @@ def test_issue_613(pdf_samples, request):
         assert obj.read() == expected
 
 
-@pytest.mark.posix_only
+@pytest.mark.requires_zlib_over_zlib_ng
 def test_sample_template_library(
     pdf_samples, image_samples, sample_font_stream, request
 ):

{pypdfform-5.2.3 → pypdfform-5.2.4}/tests/test_paragraph.py

@@ -46,7 +46,7 @@ def test_fill_sejda_complex_flatten(
         assert obj.read() == expected
 
 
-@pytest.mark.posix_only
+@pytest.mark.requires_zlib_over_zlib_ng
 def test_paragraph_complex(sample_template_paragraph_complex, pdf_samples, request):
     expected_path = os.path.join(pdf_samples, "paragraph", "test_paragraph_complex.pdf")
     with open(expected_path, "rb+") as f:
@@ -70,7 +70,7 @@ def test_paragraph_complex(sample_template_paragraph_complex, pdf_samples, reque
         assert obj.read() == expected
 
 
-@pytest.mark.posix_only
+@pytest.mark.requires_zlib_over_zlib_ng
 def test_paragraph_max_length(
     sample_template_with_paragraph_max_length, pdf_samples, request
 ):

{pypdfform-5.2.3 → pypdfform-5.2.4}/tests/test_signature.py

@@ -25,7 +25,7 @@ def test_signature_sample_value(pdf_samples):
     )
 
 
-@pytest.mark.posix_only
+@pytest.mark.requires_zlib_over_zlib_ng
 def test_fill_signature_overlap(pdf_samples, image_samples, request):
     expected_path = os.path.join(
         pdf_samples, "signature", "test_fill_signature_overlap.pdf"
@@ -46,7 +46,7 @@ def test_fill_signature_overlap(pdf_samples, image_samples, request):
         assert obj.read() == expected
 
 
-@pytest.mark.posix_only
+@pytest.mark.requires_zlib_over_zlib_ng
 def test_fill_small_icon(pdf_samples, image_samples, request):
     expected_path = os.path.join(pdf_samples, "signature", "test_fill_small_icon.pdf")
     with open(expected_path, "rb+") as f:
@@ -66,7 +66,7 @@ def test_fill_small_icon(pdf_samples, image_samples, request):
         assert obj.read() == expected
 
 
-@pytest.mark.posix_only
+@pytest.mark.requires_zlib_over_zlib_ng
 def test_fill_small_icon_not_preserve_aspect_ratio(pdf_samples, image_samples, request):
     expected_path = os.path.join(
         pdf_samples, "signature", "test_fill_small_icon_not_preserve_aspect_ratio.pdf"

{pypdfform-5.2.3 → pypdfform-5.2.4}/tests/test_widget_attr_trigger.py

@@ -7,7 +7,7 @@ import pytest
 from PyPDFForm import Fields, PdfWrapper, RawElements
 
 
-@pytest.mark.posix_only
+@pytest.mark.requires_zlib_over_zlib_ng
 def test_register_font_no_form_fields(pdf_samples, sample_font_stream, request):
     expected_path = os.path.join(
         pdf_samples, "test_widget_attr_trigger", "test_register_font_no_form_fields.pdf"
@@ -28,7 +28,7 @@ def test_register_font_no_form_fields(pdf_samples, sample_font_stream, request):
         assert obj.read() == expected
 
 
-@pytest.mark.posix_only
+@pytest.mark.requires_zlib_over_zlib_ng
 def test_set_text_field_font_sejda(pdf_samples, font_samples, sejda_template, request):
     expected_path = os.path.join(
         pdf_samples,
@@ -219,7 +219,7 @@ def test_set_radio_size_sejda(pdf_samples, sejda_template, request):
         assert obj.read() == expected
 
 
-@pytest.mark.posix_only
+@pytest.mark.requires_zlib_over_zlib_ng
 def test_set_dropdown_font_sejda(
     pdf_samples, dropdown_alignment_sejda, sample_font_stream, request
 ):