Merge pull request matplotlib#29932 from meeseeksmachine/auto-backport-of-pr-29920-on-v3.10.x

Author: timhoffm

lib/matplotlib/axes/_base.py

@@ -1612,7 +1612,7 @@ def set_prop_cycle(self, *args, **kwargs):
 
         Parameters
         ----------
-        cycler : `~cycler.Cycler`
+        cycler : `~cycler.Cycler` or ``None``
             Set the given Cycler. *None* resets to the cycle defined by the
             current style.
 

lib/matplotlib/axes/_base.pyi

@@ -181,7 +181,7 @@ class _AxesBase(martist.Artist):
     def get_facecolor(self) -> ColorType: ...
     def set_facecolor(self, color: ColorType | None) -> None: ...
     @overload
-    def set_prop_cycle(self, cycler: Cycler) -> None: ...
+    def set_prop_cycle(self, cycler: Cycler | None) -> None: ...
     @overload
     def set_prop_cycle(self, label: str, values: Iterable[Any]) -> None: ...
     @overload