svg-ultralight 0.37.0__tar.gz → 0.38.0__tar.gz

{svg_ultralight-0.37.0 → svg_ultralight-0.38.0}/.pre-commit-config.yaml

@@ -42,7 +42,7 @@ repos:
         # files: .pre-commit-config.yaml
 
 - repo: https://github.com/pre-commit/mirrors-mypy
-  rev: v1.14.0
+  rev: v1.15.0
   hooks:
   - id: mypy
     name: mypy
@@ -92,7 +92,7 @@ repos:
   # S301 don't use pickle
   # B028 wants explicit stacklevel on warn
   # BLE001 Use of `except Exception:` detected
-  rev: 'v0.8.4'
+  rev: 'v0.11.4'
   hooks:
     - id: ruff
       name: "ruff-lint"
@@ -110,6 +110,6 @@ repos:
 
 # reads pyproject.toml for additional config
 - repo: https://github.com/RobertCraigie/pyright-python
-  rev: v1.1.391
+  rev: v1.1.398
   hooks:
     - id: pyright

{svg_ultralight-0.37.0/src/svg_ultralight.egg-info → svg_ultralight-0.38.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: svg-ultralight
-Version: 0.37.0
+Version: 0.38.0
 Summary: a sensible way to create svg files with Python
 Author-email: Shay Hill <shay_public@hotmail.com>
 License: MIT
@@ -10,6 +10,7 @@ Requires-Dist: lxml
 Requires-Dist: pillow
 Requires-Dist: paragraphs
 Requires-Dist: types-lxml
+Requires-Dist: typing-extensions
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: commitizen; extra == "dev"
@@ -187,7 +188,7 @@ Another way to add params through the new_element name / float translator. Again
 
 ## Extras:
 
-### query.map_ids_to_bounding_boxes
+### query.map_elems_to_bounding_boxes
 
 Python cannot parse an svg file. Python can *create* an svg file, and Inkscape can parse (and inspect) it. Inkscape has a command-line interface capable of reading an svg file and returning some limited information. This is the only way I know for a Python program to:
 
@@ -197,7 +198,7 @@ Python cannot parse an svg file. Python can *create* an svg file, and Inkscape c
 
 This would be necessary for, e.g., algorithmically fitting text in a box.
 
-    from svg_ultralight.queries import map_ids_to_bounding_boxes
+    from svg_ultralight.queries import map_elems_to_bounding_boxes
 
 You can get a tiny bit more sophisticated with Inkscape bounding-box queries, but not much. This will give you pretty much all you can get out of it.
 

{svg_ultralight-0.37.0 → svg_ultralight-0.38.0}/README.md

@@ -167,7 +167,7 @@ Another way to add params through the new_element name / float translator. Again
 
 ## Extras:
 
-### query.map_ids_to_bounding_boxes
+### query.map_elems_to_bounding_boxes
 
 Python cannot parse an svg file. Python can *create* an svg file, and Inkscape can parse (and inspect) it. Inkscape has a command-line interface capable of reading an svg file and returning some limited information. This is the only way I know for a Python program to:
 
@@ -177,7 +177,7 @@ Python cannot parse an svg file. Python can *create* an svg file, and Inkscape c
 
 This would be necessary for, e.g., algorithmically fitting text in a box.
 
-    from svg_ultralight.queries import map_ids_to_bounding_boxes
+    from svg_ultralight.queries import map_elems_to_bounding_boxes
 
 You can get a tiny bit more sophisticated with Inkscape bounding-box queries, but not much. This will give you pretty much all you can get out of it.
 

{svg_ultralight-0.37.0 → svg_ultralight-0.38.0}/pyproject.toml

@@ -1,12 +1,12 @@
 [project]
 name = "svg-ultralight"
-version = "0.37.0"
+version = "0.38.0"
 description = "a sensible way to create svg files with Python"
 authors = [{ name = "Shay Hill", email = "shay_public@hotmail.com" }]
 license = { text = "MIT" }
 readme = "README.md"
 requires-python = ">=3.9"
-dependencies = ["lxml", "pillow", "paragraphs", "types-lxml"]
+dependencies = ["lxml", "pillow", "paragraphs", "types-lxml", "typing-extensions"]
 
 [project.optional-dependencies]
 dev = ["pytest", "commitizen", "pre-commit", "tox"]
@@ -42,7 +42,7 @@ convention = "pep257"
 
 [tool.commitizen]
 name = "cz_conventional_commits"
-version = "0.37.0"
+version = "0.38.0"
 tag_format = "$version"
 version_files = ["pyproject.toml:^version"]
 annotated_tag = true

{svg_ultralight-0.37.0 → svg_ultralight-0.38.0}/src/svg_ultralight/bounding_boxes/bound_helpers.py

@@ -8,7 +8,7 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING
 
-from lxml.etree import _Element as EtreeElement  # type: ignore
+from lxml.etree import _Element as EtreeElement  # pyright: ignore[reportPrivateUsage]
 
 from svg_ultralight.bounding_boxes.type_bound_element import BoundElement
 from svg_ultralight.bounding_boxes.type_bounding_box import BoundingBox

{svg_ultralight-0.37.0 → svg_ultralight-0.38.0}/src/svg_ultralight/bounding_boxes/type_bound_collection.py

@@ -9,7 +9,7 @@ from __future__ import annotations
 import dataclasses
 from typing import TYPE_CHECKING
 
-from lxml.etree import _Element as EtreeElement  # type: ignore
+from lxml.etree import _Element as EtreeElement  # pyright: ignore[reportPrivateUsage]
 
 from svg_ultralight.bounding_boxes.bound_helpers import new_bbox_union
 from svg_ultralight.bounding_boxes.type_bounding_box import HasBoundingBox

{svg_ultralight-0.37.0 → svg_ultralight-0.38.0}/src/svg_ultralight/bounding_boxes/type_bound_element.py

@@ -19,7 +19,9 @@ from svg_ultralight.bounding_boxes.type_bounding_box import HasBoundingBox
 from svg_ultralight.transformations import new_transformation_matrix, transform_element
 
 if TYPE_CHECKING:
-    from lxml.etree import _Element as EtreeElement  # type: ignore
+    from lxml.etree import (
+        _Element as EtreeElement,  # pyright: ignore[reportPrivateUsage]
+    )
 
     from svg_ultralight.bounding_boxes.type_bounding_box import BoundingBox
 

{svg_ultralight-0.37.0 → svg_ultralight-0.38.0}/src/svg_ultralight/bounding_boxes/type_padded_text.py

@@ -70,7 +70,9 @@ from svg_ultralight.bounding_boxes.supports_bounds import SupportsBounds
 from svg_ultralight.bounding_boxes.type_bounding_box import BoundingBox
 
 if TYPE_CHECKING:
-    from lxml.etree import _Element as EtreeElement  # type: ignore
+    from lxml.etree import (
+        _Element as EtreeElement,  # pyright: ignore[reportPrivateUsage]
+    )
 
 _Matrix = tuple[float, float, float, float, float, float]
 

{svg_ultralight-0.37.0 → svg_ultralight-0.38.0}/src/svg_ultralight/constructors/new_element.py

@@ -21,7 +21,9 @@ from svg_ultralight.string_conversion import set_attributes
 
 if TYPE_CHECKING:
     from lxml.etree import QName
-    from lxml.etree import _Element as EtreeElement  # type: ignore
+    from lxml.etree import (
+        _Element as EtreeElement,  # pyright: ignore[reportPrivateUsage]
+    )
 
 
 def new_element(tag: str | QName, **attributes: str | float) -> EtreeElement:

{svg_ultralight-0.37.0 → svg_ultralight-0.38.0}/src/svg_ultralight/inkscape.py

@@ -30,7 +30,9 @@ from lxml import etree
 from svg_ultralight import main
 
 if TYPE_CHECKING:
-    from lxml.etree import _Element as EtreeElement  # type: ignore
+    from lxml.etree import (
+        _Element as EtreeElement,  # pyright: ignore[reportPrivateUsage]
+    )
 
 
 def write_png_from_svg(

{svg_ultralight-0.37.0 → svg_ultralight-0.38.0}/src/svg_ultralight/main.py

@@ -13,6 +13,7 @@ should work with all Inkscape versions. Please report any issues.
 
 from __future__ import annotations
 
+import sys
 from pathlib import Path
 from typing import IO, TYPE_CHECKING
 
@@ -23,8 +24,15 @@ from svg_ultralight.layout import pad_and_scale
 from svg_ultralight.nsmap import NSMAP
 from svg_ultralight.string_conversion import get_viewBox_str, svg_tostring
 
+if sys.version_info >= (3, 10):
+    from typing import TypeGuard
+else:
+    from typing_extensions import TypeGuard
+
 if TYPE_CHECKING:
-    from lxml.etree import _Element as EtreeElement  # type: ignore
+    from lxml.etree import (
+        _Element as EtreeElement,  # pyright: ignore[reportPrivateUsage]
+    )
 
     from svg_ultralight.layout import PadArg
 
@@ -38,7 +46,7 @@ def _is_four_floats(objs: tuple[object, ...]) -> bool:
     return len(objs) == 4 and all(isinstance(x, (float, int)) for x in objs)
 
 
-def _is_io_bytes(obj: object) -> bool:
+def _is_io_bytes(obj: object) -> TypeGuard[IO[bytes]]:
     """Determine if an object is file-like.
 
     :param obj: object
@@ -172,8 +180,8 @@ def write_svg(
     svg_contents = svg_tostring(root, **tostring_kwargs)
 
     if _is_io_bytes(svg):
-        _ = svg.write(svg_contents)  # type: ignore
-        return svg.name  # type: ignore
+        _ = svg.write(svg_contents)
+        return svg.name
     if isinstance(svg, (Path, str)):
         with Path(svg).open("wb") as svg_file:
             _ = svg_file.write(svg_contents)

{svg_ultralight-0.37.0 → svg_ultralight-0.38.0}/src/svg_ultralight/metadata.py

@@ -9,7 +9,7 @@ fields.
 
 import warnings
 
-from lxml.etree import _Element as EtreeElement  # type: ignore
+from lxml.etree import _Element as EtreeElement  # pyright: ignore[reportPrivateUsage]
 
 from svg_ultralight.constructors.new_element import new_element, new_sub_element
 from svg_ultralight.nsmap import new_qname

{svg_ultralight-0.37.0 → svg_ultralight-0.38.0}/src/svg_ultralight/query.py

@@ -21,7 +21,7 @@ from copy import deepcopy
 from pathlib import Path
 from subprocess import PIPE, Popen
 from tempfile import NamedTemporaryFile, TemporaryFile
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Literal
 from warnings import warn
 
 from lxml import etree
@@ -31,7 +31,11 @@ from svg_ultralight.bounding_boxes.type_padded_text import PaddedText
 from svg_ultralight.main import new_svg_root, write_svg
 
 if TYPE_CHECKING:
-    from lxml.etree import _Element as EtreeElement  # type: ignore
+    from collections.abc import Iterator
+
+    from lxml.etree import (
+        _Element as EtreeElement,  # pyright: ignore[reportPrivateUsage]
+    )
 
 
 with TemporaryFile() as f:
@@ -39,20 +43,23 @@ with TemporaryFile() as f:
 
 _CACHE_DIR.mkdir(exist_ok=True)
 
+_TEMP_ID_PREFIX = "svg_ultralight-temp_query_module-"
+
+
+def _iter_elems(*elem_args: EtreeElement) -> Iterator[EtreeElement]:
+    """Yield element and sub-elements."""
+    for elem in elem_args:
+        yield from elem.iter()
+
 
 def _fill_ids(*elem_args: EtreeElement) -> None:
     """Set the id attribute of an element and all its children. Keep existing ids.
 
     :param elem: an etree element, accepts multiple arguments
     """
-    if not elem_args:
-        return
-    elem = elem_args[0]
-    for child in elem:
-        _fill_ids(child)
-    if elem.get("id") is None:
-        elem.set("id", f"svg_ul-{uuid.uuid4()}")
-    _fill_ids(*elem_args[1:])
+    for elem in _iter_elems(*elem_args):
+        if elem.get("id") is None:
+            elem.set("id", f"{_TEMP_ID_PREFIX}-{uuid.uuid4()}")
 
 
 def _normalize_views(elem: EtreeElement) -> None:
@@ -83,19 +90,30 @@ def _envelop_copies(*elem_args: EtreeElement) -> EtreeElement:
     return envelope
 
 
-def map_ids_to_bounding_boxes(
+def _split_bb_string(bb_string: str) -> tuple[str, BoundingBox]:
+    """Split a bounding box string into id and BoundingBox instance.
+
+    :param bb_string: "id,x,y,width,height"
+    :return: (id, BoundingBox(x, y, width, height))
+    """
+    id_, *bounds = bb_string.split(",")
+    x, y, width, height = (float(x) for x in bounds)
+    return id_, BoundingBox(x, y, width, height)
+
+
+def map_elems_to_bounding_boxes(
     inkscape: str | Path, *elem_args: EtreeElement
-) -> dict[str, BoundingBox]:
+) -> dict[EtreeElement | Literal["svg"], BoundingBox]:
     r"""Query an svg file for bounding-box dimensions.
 
     :param inkscape: path to an inkscape executable on your local file system
         IMPORTANT: path cannot end with ``.exe``.
         Use something like ``"C:\\Program Files\\Inkscape\\inkscape"``
     :param elem_args: xml element (written to a temporary file then queried)
-    :return: svg element ids (and a bounding box for the entire svg file as ``svg``)
-        mapped to (x, y, width, height)
-    :effects: adds an id attribute to any element without one. These will all have
-        the prefix svg_ul-, so you can find and remove them later if desired.
+    :return: svg elements (and a bounding box for the entire svg file as ``svg``)
+        mapped to BoundingBox(x, y, width, height)
+    :effects: temporarily adds an id attribute if any ids are missing. Non-unique ids
+        will break this function.
 
     Bounding boxes are relative to svg viewbox. If viewbox x == -10,
     all bounding-box x values will be offset -10. So, everything is wrapped in a root
@@ -126,14 +144,18 @@ def map_ids_to_bounding_boxes(
         svg = write_svg(svg_file, envelope)
     with Popen(f'"{inkscape}" --query-all {svg}', stdout=PIPE) as bb_process:
         bb_data = str(bb_process.communicate()[0])[2:-1]
-        bb_strings = re.split(r"[\\r]*\\n", bb_data)[:-1]
     os.unlink(svg_file.name)
+    bb_strings = re.split(r"[\\r]*\\n", bb_data)[:-1]
+    id2bbox = dict(map(_split_bb_string, bb_strings))
 
-    id2bbox: dict[str, BoundingBox] = {}
-    for id_, *bounds in (x.split(",") for x in bb_strings):
-        x, y, width, height = (float(x) for x in bounds)
-        id2bbox[id_] = BoundingBox(x, y, width, height)
-    return id2bbox
+    elem2bbox: dict[EtreeElement | Literal["svg"], BoundingBox] = {}
+    for elem in _iter_elems(*elem_args):
+        elem2bbox[elem] = id2bbox.pop(elem.attrib["id"])
+        if elem.attrib["id"].startswith(_TEMP_ID_PREFIX):
+            del elem.attrib["id"]
+    ((_, scene_bbox),) = id2bbox.items()
+    elem2bbox["svg"] = scene_bbox
+    return elem2bbox
 
 
 def _hash_elem(elem: EtreeElement) -> str:
@@ -178,7 +200,7 @@ def get_bounding_boxes(
 
     This will work most of the time, but if you're missing an nsmap, you'll need to
     create an entire xml file with a custom nsmap (using
-    `svg_ultralight.new_svg_root`) then call `map_ids_to_bounding_boxes` directly.
+    `svg_ultralight.new_svg_root`) then call `map_elems_to_bounding_boxes` directly.
     """
     elem2hash = {elem: _hash_elem(elem) for elem in elem_args}
     cached = [_try_bbox_cache(h) for h in elem2hash.values()]
@@ -187,10 +209,10 @@ def get_bounding_boxes(
 
     hash2bbox = {h: c for h, c in zip(elem2hash.values(), cached) if c is not None}
     remainder = [e for e, c in zip(elem_args, cached) if c is None]
-    id2bbox = map_ids_to_bounding_boxes(inkscape, *remainder)
+    id2bbox = map_elems_to_bounding_boxes(inkscape, *remainder)
     for elem in remainder:
         hash_ = elem2hash[elem]
-        hash2bbox[hash_] = id2bbox[elem.attrib["id"]]
+        hash2bbox[hash_] = id2bbox[elem]
         with (_CACHE_DIR / hash_).open("wb") as f:
             pickle.dump(hash2bbox[hash_], f)
     return tuple(hash2bbox[h] for h in elem2hash.values())

{svg_ultralight-0.37.0 → svg_ultralight-0.38.0}/src/svg_ultralight/root_elements.py

@@ -13,7 +13,9 @@ from svg_ultralight.bounding_boxes.type_bounding_box import BoundingBox
 from svg_ultralight.main import new_svg_root
 
 if TYPE_CHECKING:
-    from lxml.etree import _Element as EtreeElement  # type: ignore
+    from lxml.etree import (
+        _Element as EtreeElement,  # pyright: ignore[reportPrivateUsage]
+    )
 
     from svg_ultralight.bounding_boxes.supports_bounds import SupportsBounds
     from svg_ultralight.layout import PadArg

{svg_ultralight-0.37.0 → svg_ultralight-0.38.0}/src/svg_ultralight/string_conversion.py

@@ -22,7 +22,9 @@ from svg_ultralight.nsmap import NSMAP
 if TYPE_CHECKING:
     from collections.abc import Iterable
 
-    from lxml.etree import _Element as EtreeElement  # type: ignore
+    from lxml.etree import (
+        _Element as EtreeElement,  # pyright: ignore[reportPrivateUsage]
+    )
 
 
 def format_number(num: float | str) -> str:
@@ -120,7 +122,9 @@ def _fix_key_and_format_val(key: str, val: str | float) -> tuple[str, str]:
     popular one will be 'class') can be passed with a trailing underscore (e.g.,
     class_='body_text').
     """
-    if ":" in key:
+    if "http:" in key or "https:" in key:
+        key_ = key
+    elif ":" in key:
         namespace, tag = key.split(":")
         key_ = str(etree.QName(NSMAP[namespace], tag))
     else:
@@ -184,7 +188,7 @@ def svg_tostring(xml: EtreeElement, **tostring_kwargs: str | bool | None) -> byt
             value = tostring_kwargs.get(arg_name, default.value)
             tostring_kwargs[arg_name] = value
     as_bytes = etree.tostring(etree.ElementTree(xml), **tostring_kwargs)  # type: ignore
-    return cast(bytes, as_bytes)
+    return cast("bytes", as_bytes)
 
 
 def get_viewBox_str(

{svg_ultralight-0.37.0 → svg_ultralight-0.38.0}/src/svg_ultralight/transformations.py

@@ -13,10 +13,12 @@ from typing import TYPE_CHECKING, cast
 from svg_ultralight.string_conversion import format_number
 
 if TYPE_CHECKING:
-    from lxml.etree import _Element as EtreeElement  # type: ignore
+    from lxml.etree import (
+        _Element as EtreeElement,  # pyright: ignore[reportPrivateUsage]
+    )
 
 
-_RE_MATRIX = re.compile(r"matrix\(([^)]+)\)")
+RE_MATRIX = re.compile(r"matrix\(([^)]+)\)")
 
 _Matrix = tuple[float, float, float, float, float, float]
 
@@ -86,7 +88,7 @@ def get_transform_matrix(elem: EtreeElement) -> _Matrix:
         return (1, 0, 0, 1, 0, 0)
     values_str = ""
     with suppress(AttributeError):
-        values_str = cast(re.Match[str], _RE_MATRIX.match(transform)).group(1)
+        values_str = cast("re.Match[str]", RE_MATRIX.match(transform)).group(1)
     with suppress(ValueError):
         aa, bb, cc, dd, ee, ff = (float(val) for val in values_str.split())
         return (aa, bb, cc, dd, ee, ff)

{svg_ultralight-0.37.0 → svg_ultralight-0.38.0/src/svg_ultralight.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: svg-ultralight
-Version: 0.37.0
+Version: 0.38.0
 Summary: a sensible way to create svg files with Python
 Author-email: Shay Hill <shay_public@hotmail.com>
 License: MIT
@@ -10,6 +10,7 @@ Requires-Dist: lxml
 Requires-Dist: pillow
 Requires-Dist: paragraphs
 Requires-Dist: types-lxml
+Requires-Dist: typing-extensions
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: commitizen; extra == "dev"
@@ -187,7 +188,7 @@ Another way to add params through the new_element name / float translator. Again
 
 ## Extras:
 
-### query.map_ids_to_bounding_boxes
+### query.map_elems_to_bounding_boxes
 
 Python cannot parse an svg file. Python can *create* an svg file, and Inkscape can parse (and inspect) it. Inkscape has a command-line interface capable of reading an svg file and returning some limited information. This is the only way I know for a Python program to:
 
@@ -197,7 +198,7 @@ Python cannot parse an svg file. Python can *create* an svg file, and Inkscape c
 
 This would be necessary for, e.g., algorithmically fitting text in a box.
 
-    from svg_ultralight.queries import map_ids_to_bounding_boxes
+    from svg_ultralight.queries import map_elems_to_bounding_boxes
 
 You can get a tiny bit more sophisticated with Inkscape bounding-box queries, but not much. This will give you pretty much all you can get out of it.
 

{svg_ultralight-0.37.0 → svg_ultralight-0.38.0}/src/svg_ultralight.egg-info/requires.txt

@@ -2,6 +2,7 @@ lxml
 pillow
 paragraphs
 types-lxml
+typing-extensions
 
 [dev]
 pytest

{svg_ultralight-0.37.0 → svg_ultralight-0.38.0}/tests/test_inkscape.py

@@ -10,7 +10,7 @@ from pathlib import Path
 
 import pytest
 from lxml import etree
-from lxml.etree import _Element as EtreeElement  # type: ignore
+from lxml.etree import _Element as EtreeElement  # pyright: ignore[reportPrivateUsage]
 
 from svg_ultralight.constructors import new_sub_element
 from svg_ultralight.inkscape import convert_text_to_path

{svg_ultralight-0.37.0 → svg_ultralight-0.38.0}/tests/test_queries.py

@@ -14,7 +14,7 @@ import pytest
 
 from svg_ultralight import BoundingBox, new_svg_root
 from svg_ultralight.constructors import new_sub_element
-from svg_ultralight.query import map_ids_to_bounding_boxes, get_bounding_boxes, get_bounding_box
+from svg_ultralight.query import map_elems_to_bounding_boxes, get_bounding_boxes, get_bounding_box
 
 INKSCAPE = Path(r"C:\Program Files\Inkscape\bin\inkscape")
 
@@ -153,23 +153,24 @@ class TestMapIdsToBoundingBoxes:
     def test_gets_bboxes(self) -> None:
         """Run with a temporary file."""
         xml = new_svg_root(10, 20, 160, 19, id="svg1")
-        _ = new_sub_element(xml, "rect", id="rect1", x=0, y=0, width=16, height=9)
-        _ = new_sub_element(xml, "rect", id="rect2", x=0, y=0, width=8, height=32)
-        result = map_ids_to_bounding_boxes(INKSCAPE, xml)
-        assert result["rect1"] == BoundingBox(0.0, 0.0, 16.0, 9.0)
-        assert result["rect2"] == BoundingBox(0.0, 0.0, 8.0, 32.0)
-
-    def test_adds_missing_ids(self) -> None:
-        """Returns a dict with an entry for each element plus an envelope entry."""
+        rect1 = new_sub_element(xml, "rect", id="rect1", x=0, y=0, width=16, height=9)
+        rect2 = new_sub_element(xml, "rect", id="rect2", x=0, y=0, width=8, height=32)
+        result = map_elems_to_bounding_boxes(INKSCAPE, xml)
+        assert result[rect1] == BoundingBox(0.0, 0.0, 16.0, 9.0)
+        assert result[rect2] == BoundingBox(0.0, 0.0, 8.0, 32.0)
+
+    def test_removes_temp_ids(self) -> None:
+        """Removes temporary IDs created during bounding box mapping."""
         xml = new_svg_root(10, 20, 160, 19, id="svg1")
         rect1 = new_sub_element(xml, "rect", x=0, y=0, width=16, height=9)
         rect2 = new_sub_element(xml, "rect", x=0, y=0, width=8, height=32)
         rect3 = new_sub_element(xml, "rect", x=0, y=0, width=12, height=18)
-        result = map_ids_to_bounding_boxes(INKSCAPE, xml)
-        assert xml.get("id") in result
-        assert rect1.get("id") in result
-        assert rect2.get("id") in result
-        assert rect3.get("id") in result
+        result = map_elems_to_bounding_boxes(INKSCAPE, xml)
+        for elem in (xml, rect1, rect2, rect3):
+            assert elem in result
+        assert xml.attrib.get("id") == "svg1"
+        for elem in (rect1, rect2, rect3):
+            assert "id" not in elem.attrib
 
     def test_get_bboxes_explicit(self) -> None:
         """Returns a dict with an entry for each element plus an envelope entry."""

{svg_ultralight-0.37.0 → svg_ultralight-0.38.0}/tests/test_root_elements.py

@@ -12,7 +12,7 @@ from svg_ultralight.bounding_boxes.type_padded_text import PaddedText
 from svg_ultralight.constructors import new_element
 from svg_ultralight.root_elements import new_svg_root_around_bounds
 from svg_ultralight.bounding_boxes.bound_helpers import new_bound_union
-from lxml.etree import _Element as EtreeElement  # type: ignore
+from lxml.etree import _Element as EtreeElement  # pyright: ignore[reportPrivateUsage]
 
 
 class TestNewSvgRootAroundBounds:

{svg_ultralight-0.37.0 → svg_ultralight-0.38.0}/tests/test_svg_ultralight.py

@@ -14,7 +14,7 @@ from pathlib import Path
 
 import pytest
 from lxml import etree
-from lxml.etree import _Element as EtreeElement  # type: ignore
+from lxml.etree import _Element as EtreeElement  # pyright: ignore[reportPrivateUsage]
 
 from svg_ultralight import NSMAP