Merge pull request matplotlib#27220 from rcomer/backport-contour-typehints

Backport PR matplotlib#27217 on branch v3.8.x: Fix type hints for undeprecated contour APIs

Author: timhoffm

ci/mypy-stubtest-allowlist.txt

@@ -46,10 +46,6 @@ matplotlib.widgets.MultiCursor.needclear
 
 # 3.8 deprecations
 matplotlib.cbook.get_sample_data
-matplotlib.contour.ContourSet.allkinds
-matplotlib.contour.ContourSet.allsegs
-matplotlib.contour.ContourSet.tcolors
-matplotlib.contour.ContourSet.tlinewidths
 matplotlib.ticker.LogLocator.__init__
 matplotlib.ticker.LogLocator.set_params
 

lib/matplotlib/contour.pyi

@@ -103,12 +103,17 @@ class ContourSet(ContourLabeler, Collection):
     clip_path: Patch | Path | TransformedPath | TransformedPatchPath | None
     labelTexts: list[Text]
     labelCValues: list[ColorType]
-    allkinds: list[np.ndarray]
-    tcolors: list[tuple[float, float, float, float]]
+    @property
+    def tcolors(self) -> list[tuple[tuple[float, float, float, float]]]: ...
 
     # only for not filled
-    tlinewidths: list[tuple[float]]
+    @property
+    def tlinewidths(self) -> list[tuple[float]]: ...
 
+    @property
+    def allkinds(self) -> list[list[np.ndarray | None]]: ...
+    @property
+    def allsegs(self) -> list[list[np.ndarray]]: ...
     @property
     def alpha(self) -> float | None: ...
     @property

lib/matplotlib/path.pyi

@@ -30,7 +30,7 @@ class Path:
     @vertices.setter
     def vertices(self, vertices: ArrayLike) -> None: ...
     @property
-    def codes(self) -> ArrayLike: ...
+    def codes(self) -> ArrayLike | None: ...
     @codes.setter
     def codes(self, codes: ArrayLike) -> None: ...
     @property