Fix preexisting type errors exposed by mypy

Author: eevleevs

src/ezdxf/acc/__init__.py

@@ -31,7 +31,7 @@
 
 if USE_C_EXT:
     try:
-        from ezdxf.acc import vector
+        from ezdxf.acc import vector  # type: ignore[attr-defined]
     except ImportError:
         USE_C_EXT = False
 

src/ezdxf/addons/dimlines.py

@@ -312,15 +312,15 @@ def _get_section_points(self, section: int) -> tuple[Vec3, Vec3]:
         """
         Get start and end point on the dimension line of dimension section.
         """
-        return self._get_dimline_point(section), self._get_dimline_point(
+        return Vec3(self._get_dimline_point(section)), Vec3(self._get_dimline_point(
             section + 1
-        )
+        ))
 
     def _get_dimline_bounds(self) -> tuple[Vec3, Vec3]:
         """
         Get the first and the last point of dimension line.
         """
-        return self._get_dimline_point(0), self._get_dimline_point(-1)
+        return Vec3(self._get_dimline_point(0)), Vec3(self._get_dimline_point(-1))
 
     @property
     def section_count(self) -> int:
@@ -357,7 +357,7 @@ def _build_vectors(self) -> None:
     @staticmethod
     def _get_point_on_dimline(point: UVec, dimray: ConstructionRay) -> Vec3:
         """get the measure target point projection on the dimension line"""
-        return dimray.intersect(dimray.orthogonal(point))
+        return Vec3(dimray.intersect(dimray.orthogonal(point)))
 
     def _draw_dimline(self, layout: "GenericLayoutType") -> None:
         """build dimension line entity"""
@@ -640,9 +640,9 @@ def __init__(
     def _setup(self) -> None:
         super()._setup()
         if self.arc3points:
-            self.center = center_of_3points_arc(
+            self.center = Vec3(center_of_3points_arc(
                 self.center, self.start, self.end
-            )
+            ))
 
     def _get_extline_start(self, vector: Vec3) -> Vec3:
         return self.center + (

src/ezdxf/addons/drawing/debug_utils.py

@@ -12,4 +12,4 @@ def draw_rect(points: list[Vec3], color: Color, out: BackendInterface):
 
     props = BackendProperties(color=color)
     for a, b in zip(points, points[1:]):
-        out.draw_line(a, b, props)
+        out.draw_line(a, b, props)  # type: ignore[arg-type]

src/ezdxf/addons/drawing/dxf.py

@@ -160,7 +160,7 @@ def draw_filled_polygon(
         self, points: BkPoints2d, properties: BackendProperties
     ) -> None:
         hatch = self.layout.add_hatch(dxfattribs=self.resolve_properties(properties))
-        hatch.paths.add_polyline_path(points.vertices(), is_closed=True)
+        hatch.paths.add_polyline_path(points.vertices(), is_closed=True)  # type: ignore[arg-type]
         self.set_solid_fill(hatch, properties)
 
     def draw_image(self, image_data: ImageData, properties: BackendProperties) -> None:

src/ezdxf/addons/drawing/frontend.py

@@ -575,10 +575,10 @@ def timeout() -> bool:
                 for s, e in line_pattern.render(line.start, line.end):
                     if ocs.transform:
                         s, e = (
-                            ocs.to_wcs((s.x, s.y, elevation)),
-                            ocs.to_wcs((e.x, e.y, elevation)),
+                            ocs.to_wcs((s.x, s.y, elevation)).vec2,
+                            ocs.to_wcs((e.x, e.y, elevation)).vec2,
                         )
-                    lines.append((s, e))
+                    lines.append((s, e))  # type: ignore[arg-type]
         self.pipeline.draw_solid_lines(lines, properties)
 
     def draw_hatch_entity(

src/ezdxf/addons/drawing/mtext_complex.py

@@ -25,7 +25,7 @@ def corner_vertices(
     bottom: float,
     right: float,
     top: float,
-    m: Matrix44 = None,
+    m: Matrix44 | None = None,
 ) -> Iterable[Vec3]:
     corners = [  # closed polygon: fist vertex  == last vertex
         (left, top),
@@ -70,7 +70,7 @@ def render(
         bottom: float,
         right: float,
         top: float,
-        m: Matrix44 = None,
+        m: Matrix44 | None = None,
     ) -> None:
         self._render_outline(list(corner_vertices(left, bottom, right, top, m)))
 
@@ -83,7 +83,7 @@ def _render_outline(self, vertices: list[Vec3]) -> None:
             prev = vertex
 
     def line(
-        self, x1: float, y1: float, x2: float, y2: float, m: Matrix44 = None
+        self, x1: float, y1: float, x2: float, y2: float, m: Matrix44 | None = None
     ) -> None:
         points = [(x1, y1), (x2, y2)]
         if m is not None:
@@ -113,7 +113,7 @@ def render(
         bottom: float,
         right: float,
         top: float,
-        m: Matrix44 = None,
+        m: Matrix44 | None = None,
     ) -> None:
         # Important: this is not a clipping box, it is possible to
         # render anything outside of the given borders!
@@ -153,7 +153,7 @@ def render(
         bottom: float,
         right: float,
         top: float,
-        m: Matrix44 = None,
+        m: Matrix44 | None = None,
     ):
         """Create/render the text content"""
         sx = 1.0

src/ezdxf/addons/drawing/pipeline.py

@@ -429,9 +429,10 @@ def set_config(self, config: Configuration) -> None:
 
     def draw_point(self, pos: Vec2, properties: Properties) -> None:
         if self.clipping_portal.is_active:
-            pos = self.clipping_portal.clip_point(pos)
-            if pos is None:
+            clipped = self.clipping_portal.clip_point(pos)
+            if clipped is None:
                 return
+            pos = clipped
         self.next_stage.draw_point(pos, properties)
 
     def draw_line(self, start: Vec2, end: Vec2, properties: Properties):
@@ -613,7 +614,7 @@ def draw_line(self, start: Vec2, end: Vec2, properties: Properties):
 
         renderer = linetypes.LineTypeRenderer(self.pattern(properties))
         next_stage.draw_solid_lines(
-            [(s, e) for s, e in renderer.line_segment(s, e)],
+            [(s, e) for s, e in renderer.line_segment(s, e)],  # type: ignore[misc]
             properties,
         )
 

src/ezdxf/addons/mtxpl.py

@@ -32,7 +32,7 @@ def render(
         bottom: float,
         right: float,
         top: float,
-        m: Matrix44 = None,
+        m: Matrix44 | None = None,
     ) -> None:
         pline = self.layout.add_lwpolyline(
             [(left, top), (right, top), (right, bottom), (left, bottom)],
@@ -43,7 +43,7 @@ def render(
             pline.transform(m)
 
     def line(
-        self, x1: float, y1: float, x2: float, y2: float, m: Matrix44 = None
+        self, x1: float, y1: float, x2: float, y2: float, m: Matrix44 | None = None
     ) -> None:
         line = self.layout.add_line((x1, y1), (x2, y2), dxfattribs=self.line_attribs)
         if m:

src/ezdxf/addons/text2path.py

@@ -35,7 +35,7 @@ def make_path_from_str(
     size: float = 1.0,
     align=TextEntityAlignment.LEFT,
     length: float = 0,
-    m: Matrix44 = None,
+    m: Matrix44 | None = None,
 ) -> Path:
     """Convert a single line string `s` into a :term:`Multi-Path` object.
     The text `size` is the height of the uppercase letter "X" (cap height).
@@ -74,7 +74,7 @@ def make_paths_from_str(
     size: float = 1.0,
     align=TextEntityAlignment.LEFT,
     length: float = 0,
-    m: Matrix44 = None,
+    m: Matrix44 | None = None,
 ) -> list[Path]:
     """Convert a single line string `s` into a list of
     :class:`~ezdxf.path.Path` objects. All paths are returned as a list of
@@ -174,7 +174,7 @@ def make_hatches_from_str(
     align=TextEntityAlignment.LEFT,
     length: float = 0,
     dxfattribs=None,
-    m: Matrix44 = None,
+    m: Matrix44 | None = None,
 ) -> list[Hatch]:
     """Convert a single line string `s` into a list of virtual
     :class:`~ezdxf.entities.Hatch` entities.

src/ezdxf/edgeminer.py

@@ -352,7 +352,7 @@ def unique_vertices(self) -> set[Vec3]:
         e.g. if the vertices a, b are close together, you don't know if you get a or b,
         but it's guaranteed that you only get one of them
         """
-        return filter_close_vertices(self._search_index.rtree, gap_tol=self.gap_tol)
+        return filter_close_vertices(self._search_index.rtree, gap_tol=self.gap_tol)  # type: ignore[arg-type]
 
     def edges_linked_to(self, vertex: UVec, radius: float = -1) -> Sequence[Edge]:
         """Returns all edges linked to `vertex` in range of `radius`.
@@ -373,14 +373,14 @@ def find_nearest_edge(self, vertex: UVec) -> Edge | None:
         The distance is measured to the connection line from start to end of the edge.
         This is not correct for edges that represent arcs or splines.
         """
+        vertex = Vec3(vertex)
 
         def distance(edge: Edge) -> float:
             try:
                 return distance_point_line_3d(vertex, edge.start, edge.end)
             except ZeroDivisionError:
                 return edge.start.distance(vertex)
 
-        vertex = Vec3(vertex)
         si = self._search_index
         nearest_vertex = si.nearest_vertex(vertex)
         edges = self.edges_linked_to(nearest_vertex)
@@ -738,16 +738,16 @@ def __init__(self, edges: Sequence[Edge]) -> None:
         self._search_tree = rtree.RTree(vertices)
 
     @property
-    def rtree(self) -> rtree.RTree[Vec3]:
+    def rtree(self) -> rtree.RTree[_Vertex]:
         return self._search_tree
 
     def vertices_in_sphere(self, center: Vec3, radius: float) -> Sequence[_Vertex]:
         """Returns all vertices located around `center` with a max. distance of `radius`."""
-        return tuple(self._search_tree.points_in_sphere(center, radius))
+        return tuple(self._search_tree.points_in_sphere(center, radius))  # type: ignore[arg-type]
 
     def nearest_vertex(self, location: Vec3) -> _Vertex:
         """Returns the nearest vertex to the given location."""
-        vertex, _ = self._search_tree.nearest_neighbor(location)
+        vertex, _ = self._search_tree.nearest_neighbor(location)  # type: ignore[arg-type]
         return vertex