Quiet sphinx warnings (by using axes.Axes instead of Axes already in the namespace)

ksunden · ksunden · commit 29dbdf32a689 · 2023-02-01T16:01:46.000-06:00
diff --git a/lib/matplotlib/pyplot.py b/lib/matplotlib/pyplot.py
@@ -95,6 +95,7 @@
     )
 
     from matplotlib.axis import Tick
+    from matplotlib import axes
     from matplotlib.axes import SubplotBase
     from matplotlib.axes._base import _AxesBase
     from matplotlib.backend_bases import RendererBase, Event
@@ -1089,7 +1090,7 @@ def figlegend(*args, **kwargs) -> Legend:
 def axes(
     arg: None | tuple[float, float, float, float] = None,
     **kwargs
-) -> Axes:
+) -> axes.Axes:
     """
     Add an Axes to the current figure and make it the current Axes.
 
@@ -1175,7 +1176,7 @@ def axes(
         return fig.add_axes(arg, **kwargs)
 
 
-def delaxes(ax: Axes | None = None) -> None:
+def delaxes(ax: axes.Axes | None = None) -> None:
     """
     Remove an `~.axes.Axes` (defaulting to the current axes) from its figure.
     """
@@ -1413,7 +1414,7 @@ def subplots(
     subplot_kw: dict[str, Any] | None = None,
     gridspec_kw: dict[str, Any] | None = None,
     **fig_kw
-) -> tuple[Figure, Axes | np.ndarray | SubplotBase]:
+) -> tuple[Figure, axes.Axes | np.ndarray | SubplotBase]:
     """
     Create a figure and a set of subplots.
 
@@ -1577,7 +1578,7 @@ def subplot_mosaic(
     gridspec_kw: dict[str, Any] | None = None,
     per_subplot_kw: dict[Any, dict[str, Any]] | None = None,
     **fig_kw
-) -> tuple[Figure, dict[Any, Axes]]:
+) -> tuple[Figure, dict[Any, axes.Axes]]:
     """
     Build a layout of Axes based on ASCII art or nested lists.
 
@@ -1694,7 +1695,7 @@ def subplot2grid(
     rowspan: int = 1, colspan: int = 1,
     fig: Figure | None = None,
     **kwargs
-) -> Axes:
+) -> axes.Axes:
     """
     Create a subplot at a specific location inside a regular grid.
 
@@ -1756,7 +1757,7 @@ def subplot2grid(
     return ax
 
 
-def twinx(ax: Axes | None = None) -> _AxesBase:
+def twinx(ax: axes.Axes | None = None) -> _AxesBase:
     """
     Make and return a second axes that shares the *x*-axis.  The new axes will
     overlay *ax* (or the current axes if *ax* is *None*), and its ticks will be
@@ -1772,7 +1773,7 @@ def twinx(ax: Axes | None = None) -> _AxesBase:
     return ax1
 
 
-def twiny(ax: Axes | None = None) -> _AxesBase:
+def twiny(ax: axes.Axes | None = None) -> _AxesBase:
     """
     Make and return a second axes that shares the *y*-axis.  The new axes will
     overlay *ax* (or the current axes if *ax* is *None*), and its ticks will be
@@ -2227,8 +2228,8 @@ def _get_pyplot_commands() -> list[str]:
 @_copy_docstring_and_deprecators(Figure.colorbar)
 def colorbar(
     mappable: ScalarMappable | None = None,
-    cax: Axes | None = None,
-    ax: Axes | Iterable[Axes] | None = None,
+    cax: axes.Axes | None = None,
+    ax: axes.Axes | Iterable[axes.Axes] | None = None,
     **kwargs
 ) -> Colorbar:
     if mappable is None:
