Merge pull request #12050 from anntzer/cleanups

NelleV · web-flow · commit 6deccc478a5d · 2018-09-07T11:46:25.000-07:00
Various cleanups.
diff --git a/lib/matplotlib/axes/_base.py b/lib/matplotlib/axes/_base.py
@@ -2262,15 +2262,14 @@ def margins(self, *margins, x=None, y=None, tight=True):
             arguments, but can be used individually to alter on e.g.,
             only the y-axis.
 
-        tight : bool, default is True
+        tight : bool or None, default is True
             The *tight* parameter is passed to :meth:`autoscale_view`,
             which is executed after a margin is changed; the default
             here is *True*, on the assumption that when margins are
             specified, no additional padding to match tick marks is
             usually desired.  Set *tight* to *None* will preserve
             the previous setting.
 
-
         Returns
         -------
         xmargin, ymargin : float
@@ -2282,7 +2281,6 @@ def margins(self, *margins, x=None, y=None, tight=True):
         the "sticky artists" will be modified. To force all of the
         margins to be set, set :attr:`use_sticky_edges` to `False`
         before calling :meth:`margins`.
-
         """
 
         if margins and x is not None and y is not None:
diff --git a/lib/matplotlib/backend_tools.py b/lib/matplotlib/backend_tools.py
@@ -190,7 +190,6 @@ def enable(self, event=None):
 
         `trigger` calls this method when `toggled` is False
         """
-
         pass
 
     def disable(self, event=None):
@@ -206,7 +205,6 @@ def disable(self, event=None):
         * Another `ToolToggleBase` derived tool is triggered
           (from the same `ToolManager`)
         """
-
         pass
 
     @property
diff --git a/lib/matplotlib/lines.py b/lib/matplotlib/lines.py
@@ -683,7 +683,7 @@ def recache(self, always=False):
                 self.axes.name == 'rectilinear' and
                 self.axes.get_xscale() == 'linear' and
                 self._markevery is None and
-                self.get_clip_on() is True):
+                self.get_clip_on()):
             self._subslice = True
             nanmask = np.isnan(x)
             if nanmask.any():
diff --git a/lib/matplotlib/mathtext.py b/lib/matplotlib/mathtext.py
@@ -45,13 +45,17 @@
 # FONTS
 
 def get_unicode_index(symbol, math=True):
-    """get_unicode_index(symbol, [bool]) -> integer
+    r"""
+    Return the integer index (from the Unicode table) of *symbol*.
 
-Return the integer index (from the Unicode table) of symbol.  *symbol*
-can be a single unicode character, a TeX command (i.e. r'\\pi'), or a
-Type1 symbol name (i.e. 'phi').
-If math is False, the current symbol should be treated as a non-math symbol.
-"""
+    Parameters
+    ----------
+    symbol : str
+        A single unicode character, a TeX command (e.g. r'\pi') or a Type1
+        symbol name (e.g. 'phi').
+    math : bool, default is True
+        If False, always treat as a single unicode character.
+    """
     # for a non-math symbol, simply return its unicode index
     if not math:
         return ord(symbol)
