Fix type hints for undeprecated contour APIs

ksunden · ksunden · commit 44c57b4a3e33 · 2023-10-27T17:49:10.000-05:00
They whad been in the limbo land of deprecated APIs that I didn't bother to ensure were the _best_ type hints because they were deprecated. So I just added them to the allowlist for stubtest, but now that they are undeprecated, make sure that they are correct. While I'm here, may as well get rid of the allow list entries for all of them, even the ones that are still deprecated, as that is documented standard practice going forward that pyi match implementation for deprecations as well
diff --git a/ci/mypy-stubtest-allowlist.txt b/ci/mypy-stubtest-allowlist.txt
@@ -41,12 +41,6 @@ matplotlib.figure.Figure.set_tight_layout
 matplotlib.cm.register_cmap
 matplotlib.cm.unregister_cmap
 
-# 3.8 deprecations
-matplotlib.contour.ContourSet.allkinds
-matplotlib.contour.ContourSet.allsegs
-matplotlib.contour.ContourSet.tcolors
-matplotlib.contour.ContourSet.tlinewidths
-
 # positional-only argument name lacking leading underscores
 matplotlib.axes._base._AxesBase.axis
 
diff --git a/lib/matplotlib/contour.pyi b/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
diff --git a/lib/matplotlib/path.pyi b/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
