diff --git a/pypdf/_writer.py b/pypdf/_writer.py index fb3049ef0..258e5cab8 100644 --- a/pypdf/_writer.py +++ b/pypdf/_writer.py @@ -1898,15 +1898,15 @@ def add_uri( border_arr: BorderArrayType if border is not None: - border_arr = [NameObject(n) for n in border[:3]] + border_arr = [NumberObject(n) for n in border[:3]] if len(border) == 4: - dash_pattern = ArrayObject([NameObject(n) for n in border[3]]) + dash_pattern = ArrayObject([NumberObject(n) for n in border[3]]) border_arr.append(dash_pattern) else: border_arr = [NumberObject(2), NumberObject(2), NumberObject(2)] if isinstance(rect, str): - rect = NameObject(rect) + rect = NumberObject(rect) elif isinstance(rect, RectangleObject): pass else: diff --git a/pypdf/annotations/_markup_annotations.py b/pypdf/annotations/_markup_annotations.py index 4022fba2a..23c641e1e 100644 --- a/pypdf/annotations/_markup_annotations.py +++ b/pypdf/annotations/_markup_annotations.py @@ -165,8 +165,8 @@ def __init__( ), NameObject("/LE"): ArrayObject( [ - NameObject(None), - NameObject(None), + NameObject("/None"), + NameObject("/None"), ] ), NameObject("/IC"): ArrayObject( @@ -290,7 +290,7 @@ def __init__( NameObject("/Type"): NameObject("/Annot"), NameObject("/Subtype"): NameObject("/Polygon"), NameObject("/Vertices"): ArrayObject(coord_list), - NameObject("/IT"): NameObject("PolygonCloud"), + NameObject("/IT"): NameObject("/PolygonCloud"), NameObject("/Rect"): RectangleObject(_get_bounding_rectangle(vertices)), } ) diff --git a/pypdf/generic/_base.py b/pypdf/generic/_base.py index 24d11d6f1..3fde174b0 100644 --- a/pypdf/generic/_base.py +++ b/pypdf/generic/_base.py @@ -615,7 +615,7 @@ def write_to_stream( def renumber(self) -> bytes: out = self[0].encode("utf-8") if out != b"/": - logger_warning(f"Incorrect first char in NameObject:({self})", __name__) + deprecate_no_replacement(f"Incorrect first char in NameObject, should start with '/': ({self})", "6.0.0") for c in self[1:]: if c > "~": for x in c.encode("utf-8"): diff --git a/tests/test_generic.py b/tests/test_generic.py index e0a01a367..f77b018f8 100644 --- a/tests/test_generic.py +++ b/tests/test_generic.py @@ -219,9 +219,8 @@ def test_name_object(caplog): caplog.clear() b = BytesIO() - NameObject("hello").write_to_stream(b) - assert bytes(b.getbuffer()) == b"hello" - assert "Incorrect first char" in caplog.text + with pytest.raises(DeprecationWarning): + NameObject("hello").write_to_stream(b) caplog.clear() b = BytesIO()