FIX Removed random extra white space and other nitpicks

Salil Vanvari · NelleV · commit e7b3c3185326 · 2016-12-19T05:57:14.000-08:00
diff --git a/doc/users/mathtext.rst b/doc/users/mathtext.rst
@@ -214,13 +214,12 @@ When using the `STIX <http://www.stixfonts.org/>`_ fonts, you also have the choi
     ``\mathfrak{Fraktur}``                 :math-stix:`\mathfrak{Fraktur}`
     ``\mathsf{sansserif}``                 :math-stix:`\mathsf{sansserif}`
     ``\mathrm{\mathsf{sansserif}}``        :math-stix:`\mathrm{\mathsf{sansserif}}`
-    ====================================== =========================================    
+    ====================================== =========================================
 
-  .. htmlonly::   
+  .. htmlonly::
 
-    ====================================== =========================================    
+    ====================================== =========================================
     ``\mathcircled{circled}``              :math-stix:`\mathcircled{circled}`
-
     ====================================== =========================================
 
 There are also three global "font sets" to choose from, which are
diff --git a/examples/misc/multiprocess.py b/examples/misc/multiprocess.py
@@ -2,9 +2,10 @@
 # Demo of using multiprocessing for generating data in one process and plotting
 # in another.
 # Written by Robert Cimrman
-from six.moves import input
 
 from __future__ import print_function
+from six.moves import input
+
 import time
 from multiprocessing import Process, Pipe
 import numpy as np
diff --git a/examples/pylab_examples/griddata_demo.py b/examples/pylab_examples/griddata_demo.py
@@ -1,15 +1,13 @@
-from numpy.random import uniform, seed
 from matplotlib.mlab import griddata
 import matplotlib.pyplot as plt
 import numpy as np
-from six.moves import input
 
 # make up data.
-#npts = int(input('enter # of random points to plot:'))
-seed(0)
+random_state = np.random.RandomState(19680801)
+
 npts = 200
-x = uniform(-2, 2, npts)
-y = uniform(-2, 2, npts)
+x = random_state.uniform(-2, 2, npts)
+y = random_state.uniform(-2, 2, npts)
 z = x*np.exp(-x**2 - y**2)
 # define grid.
 xi = np.linspace(-2.1, 2.1, 100)
diff --git a/examples/widgets/lasso_selector_demo.py b/examples/widgets/lasso_selector_demo.py
@@ -8,13 +8,6 @@
 from matplotlib.path import Path
 
 
-try:
-    raw_input
-except NameError:
-    # Python 3
-    raw_input = input
-
-
 class SelectFromCollection(object):
     """Select indices from a matplotlib collection using `LassoSelector`.
 
diff --git a/lib/matplotlib/axes/_base.py b/lib/matplotlib/axes/_base.py
@@ -2927,17 +2927,29 @@ def get_xscale(self):
     get_xscale.__doc__ = "Return the xaxis scale string: %s""" % (
         ", ".join(mscale.get_scale_names()))
 
-    @docstring.dedent_interpd
     def set_xscale(self, value, **kwargs):
         """
         Set the x-axis scale
 
         Parameters
         ----------
-        value: float
-            Value to scale x-axis by
+        value : ["linear", "log", "symlog", "logit"]
+            scaling strategy to apply
+
+        Notes
+        -----
+        Different kwargs are accepted, depending on the scale. See
+        the `~matplotlib.scale` module for more information.
+
+        See also
+        --------
+        matplotlib.scale.LinearScale : linear transfrom
+
+        matplotlib.scale.LogTransform : log transform
 
-        Different kwargs are accepted, depending on the scale
+        matplotlib.scale.SymmetricalLogTransform : symlog transform
+
+        matplotlib.scale.LogisticTransform : logit transform
         """
         # If the scale is being set to log, clip nonposx to prevent headaches
         # around zero
@@ -3007,24 +3019,22 @@ def get_xticklabels(self, minor=False, which=None):
                                  self.xaxis.get_ticklabels(minor=minor,
                                                            which=which))
 
-    @docstring.dedent_interpd
     def set_xticklabels(self, labels, fontdict=None, minor=False, **kwargs):
         """
-        Set the xtick labels with list of strings labels
+        Set the xtick labels with list of string labels
 
         Parameters
         ----------
-        labels: list of str
+        labels : list of str
             list of string labels
 
         Returns
         -------
-        list of str
-            A list of axis text instances
+        A list of `~matplotlib.text.Text` instances
 
         Other Parameters
         -----------------
-        kwargs : :class:`~matplotlib.text.Text` properties.
+        **kwargs : `~matplotlib.text.Text` properties.
         """
         if fontdict is not None:
             kwargs.update(fontdict)
@@ -3214,20 +3224,29 @@ def get_yscale(self):
     get_yscale.__doc__ = "Return the yaxis scale string: %s""" % (
         ", ".join(mscale.get_scale_names()))
 
-    @docstring.dedent_interpd
     def set_yscale(self, value, **kwargs):
         """
         Set the y-axis scale
 
         Parameters
         ----------
-        value: float
-            Value to scale y-axis by
+        value : ["linear", "log", "symlog", "logit"]
+            scaling strategy to apply
 
-        Other Parameters
-        -----------------
-        kwargs : :class:`~matplotlib.text.Text` properties.
+        Notes
+        -----
+        Different kwargs are accepted, depending on the scale. See
+        the `~matplotlib.scale` module for more information.
+
+        See also
+        --------
+        matplotlib.scale.LinearScale : linear transfrom
+
+        matplotlib.scale.LogTransform : log transform
+
+        matplotlib.scale.SymmetricalLogTransform : symlog transform
 
+        matplotlib.scale.LogisticTransform : logit transform
         """
         # If the scale is being set to log, clip nonposy to prevent headaches
         # around zero
@@ -3300,25 +3319,22 @@ def get_yticklabels(self, minor=False, which=None):
                                  self.yaxis.get_ticklabels(minor=minor,
                                                            which=which))
 
-    @docstring.dedent_interpd
     def set_yticklabels(self, labels, fontdict=None, minor=False, **kwargs):
         """
         Set the xtick labels with list of strings labels
 
         Parameters
         ----------
-        labels: list of str
+        labels : list of str
             list of string labels
 
         Returns
         -------
-        list of str
-            A list of :class:`~matplotlib.text.Text` instances.
+        A list of `~matplotlib.text.Text` instances.
 
         Other Parameters
         ----------------
-        *kwargs* set the :class:`~matplotlib.text.Text` properties.
-
+        **kwargs : `~matplotlib.text.Text` properties.
         """
         if fontdict is not None:
             kwargs.update(fontdict)
@@ -3898,17 +3914,19 @@ def twinx(self):
         """
         Create a twin Axes sharing the xaxis
 
-        Create a twin of Axes for generating a plot with a sharex
-        x-axis but independent y axis.  The y-axis of self will have
+        Create a twin of Axes for generating a plot with a shared
+        x-axis but independent y-axis.  The y-axis of self will have
         ticks on left and the returned axes will have ticks on the
         right. To ensure tick marks of both axis align, see
-        :class:`~matplotlib.ticker.LinearLocator`
+        `~matplotlib.ticker.LinearLocator`
 
         Returns
         -------
         Axis
             The newly created axis
 
+        Notes
+        -----
         For those who are 'picking' artists while using twinx, pick
         events are only called for the artists in the top-most axes.
         """
@@ -3926,7 +3944,7 @@ def twiny(self):
         Create a twin Axes sharing the yaxis
 
         Create a twin of Axes for generating a plot with a shared
-        y-axis but independent x axis.  The x-axis of self will have
+        y-axis but independent x-axis.  The x-axis of self will have
         ticks on bottom and the returned axes will have ticks on the
         top.
 
@@ -3935,6 +3953,8 @@ def twiny(self):
         Axis
             The newly created axis
 
+        Notes
+        ------
         For those who are 'picking' artists while using twiny, pick
         events are only called for the artists in the top-most axes.
         """
