Resolve some typing todos

ksunden · ksunden · commit d6d1588ec549 · 2023-02-27T21:09:28.000-06:00
diff --git a/lib/matplotlib/axes/_axes.pyi b/lib/matplotlib/axes/_axes.pyi
@@ -32,7 +32,7 @@ from matplotlib._typing import Color, LineStyleType, MarkerType
 
 import datetime
 import PIL
-from typing import Any, Callable, Literal, Sequence, Type
+from typing import Any, Callable, Literal, Sequence, Type, overload
 import numpy as np
 from numpy.typing import ArrayLike
 
@@ -53,8 +53,15 @@ class Axes(_AxesBase):
     ) -> tuple[list[Artist], list[Any]]: ...
     legend_: Legend
 
-    # TODO: legend signatures?
-    def legend(self, *args, **kwargs) -> Legend: ...
+    @overload
+    def legend(self) -> Legend: ...
+    @overload
+    def legend(self, handles: Sequence[Artist], labels: Sequence[str]) -> Legend: ...
+    @overload
+    def legend(self, *, handles: Sequence[Artist]) -> Legend: ...
+    @overload
+    def legend(self, labels: Sequence[str]) -> Legend: ...
+
     def inset_axes(
         self,
         bounds: tuple[float, float, float, float],
@@ -260,8 +267,6 @@ class Axes(_AxesBase):
         yrange: tuple[float, float],
         **kwargs
     ) -> BrokenBarHCollection: ...
-
-    # TODO, expand out kwargs into override
     def stem(
         self,
         *args: ArrayLike | str,
diff --git a/lib/matplotlib/projections/geo.pyi b/lib/matplotlib/projections/geo.pyi
@@ -54,8 +54,6 @@ class GeoAxes(Axes):
         Literal["center", "top", "bottom", "baseline", "center_baseline"],
         Literal["center", "left", "right"],
     ]: ...
-    # TODO adust set_yscale/set_xscale once Axes stubs written
-    def set_yscale(self, *args, **kwargs) -> None: ...  # type: ignore
     def set_xlim(self, *args, **kwargs) -> tuple[float, float]: ...
     def set_ylim(self, *args, **kwargs) -> tuple[float, float]: ...
     def format_coord(self, lon: float, lat: float) -> str: ...
diff --git a/lib/matplotlib/projections/polar.pyi b/lib/matplotlib/projections/polar.pyi
@@ -53,8 +53,7 @@ class _AxisWrapper:
 
 class ThetaLocator(mticker.Locator):
     base: mticker.Locator
-    # FIXME: once ticker.pyi is done
-    axis: _AxisWrapper | None  # type: ignore
+    axis: _AxisWrapper | None
     def __init__(self, base: mticker.Locator) -> None: ...
 
 class ThetaTick(maxis.XTick):
@@ -165,8 +164,6 @@ class PolarAxes(Axes):
     ): ...
     def get_rlabel_position(self) -> float: ...
     def set_rlabel_position(self, value: float) -> None: ...
-    # TODO fix signature onces axes stubs are complete
-    def set_yscale(self, *args, **kwargs) -> None: ...  # type: ignore
     def set_rscale(self, *args, **kwargs) -> None: ...
     def set_rticks(self, *args, **kwargs) -> None: ...
     def set_thetagrids(
diff --git a/lib/matplotlib/ticker.pyi b/lib/matplotlib/ticker.pyi
@@ -1,5 +1,6 @@
 from matplotlib.axis import Axis
 from matplotlib.transforms import Transform
+from matplotlib.projections.polar import _AxisWrapper
 
 from typing import Any, Callable, Sequence, Literal
 import numpy as np
@@ -15,7 +16,7 @@ class _DummyAxis:
     def get_tick_space(self) -> int: ...
 
 class TickHelper:
-    axis: None | Axis | _DummyAxis
+    axis: None | Axis | _DummyAxis | _AxisWrapper
     def set_axis(self, axis: Axis | _DummyAxis | None) -> None: ...
     def create_dummy_axis(self, **kwargs) -> None: ...
 
