Use '... or None' instead of 'Optional[...]'.

anntzer · anntzer · commit dbd72b3bc80f · 2017-11-06T15:09:46.000-08:00
diff --git a/lib/matplotlib/artist.py b/lib/matplotlib/artist.py
@@ -538,9 +538,9 @@ def set_snap(self, snap):
 
         Parameters
         ----------
-        snap : Optional[bool]
+        snap : bool or None
             ..
-                ACCEPTS: Optional[bool]
+                ACCEPTS: bool or None
         """
         self._snap = snap
         self.stale = True
@@ -783,13 +783,13 @@ def set_rasterized(self, rasterized):
         """
         Force rasterized (bitmap) drawing in vector backend output.
 
-        Defaults to None, which implies the backend's default behavior
+        Defaults to None, which implies the backend's default behavior.
 
         Parameters
         ----------
-        rasterized : Optional[bool]
+        rasterized : bool or None
             ..
-                ACCEPTS: [True | False | None]
+                ACCEPTS: bool or None
         """
         if rasterized and not hasattr(self.draw, "_supports_rasterization"):
             warnings.warn("Rasterization of '%s' will be ignored" % self)
diff --git a/lib/matplotlib/axes/_base.py b/lib/matplotlib/axes/_base.py
@@ -2203,23 +2203,20 @@ def margins(self, *args, **kw):
 
     def set_rasterization_zorder(self, z):
         """
-        Set zorder value below which artists will be rasterized.  Set to
-        ``None`` to disable rasterizing of artists below a particular zorder.
-
-        ..
-            ACCEPTS: Optional[float]
-
         Parameters
         ----------
-        z : Optional[float]
+        z : float or None
+            zorder below which artists are rasterized.  ``None`` means that
+            artists do not get rasterized based on zorder.
+
+            ..
+                ACCEPTS: float or None
         """
         self._rasterization_zorder = z
         self.stale = True
 
     def get_rasterization_zorder(self):
-        """
-        Get zorder value below which artists will be rasterized
-        """
+        """Return the zorder value below which artists will be rasterized."""
         return self._rasterization_zorder
 
     def autoscale(self, enable=True, axis='both', tight=None):
diff --git a/lib/matplotlib/collections.py b/lib/matplotlib/collections.py
@@ -373,13 +373,13 @@ def contains(self, mouseevent):
 
     def set_urls(self, urls):
         """
-        ..
-            ACCEPTS: Optional[Iterable[str]]
+        Parameters
+        ----------
+        urls : List[str] or None
+            ..
+                ACCEPTS: List[str] or None
         """
-        if urls is None:
-            self._urls = [None, ]
-        else:
-            self._urls = urls
+        self._urls = urls if urls is not None else [None]
         self.stale = True
 
     def get_urls(self):
diff --git a/lib/matplotlib/text.py b/lib/matplotlib/text.py
@@ -1219,13 +1219,14 @@ def set_font_properties(self, fp):
 
     def set_usetex(self, usetex):
         """
-        Set whether to render using TeX.
-
-        If ``None`` is given, the option will be reset to use the value of
-        ``rcParams['text.usetex']``.
+        Parameters
+        ----------
+        usetex : bool or None
+            Whether to render using TeX, ``None`` means to use the
+            ``rcParams['text.usetex']``.
 
-        ..
-            ACCEPTS: Optional[bool]
+            ..
+                ACCEPTS: bool or None
         """
         if usetex is None:
             self._usetex = rcParams['text.usetex']
