Merge branch 'add_option_to_spy'

tacaswell · tacaswell · commit 54327204a5cd · 2014-05-18T16:31:29.000-04:00
Conflicts:
	CHANGELOG
diff --git a/CHANGELOG b/CHANGELOG
@@ -43,6 +43,8 @@
 
 2014-03-13 Add parameter 'clockwise' to function pie, True by default.
 
+2014-02-28 Added 'origin' kwarg to `spy`
+
 2014-02-27 Implemented separate horizontal/vertical axes padding to the
            ImageGrid in the AxesGrid toolkit
 
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -6567,33 +6567,41 @@ def specgram(self, x, NFFT=None, Fs=None, Fc=None, detrend=None,
         return spec, freqs, t, im
 
     def spy(self, Z, precision=0, marker=None, markersize=None,
-            aspect='equal', **kwargs):
+            aspect='equal', origin="upper", **kwargs):
         """
         Plot the sparsity pattern on a 2-D array.
 
-        Call signature::
+        ``spy(Z)`` plots the sparsity pattern of the 2-D array *Z*.
 
-          spy(Z, precision=0, marker=None, markersize=None,
-              aspect='equal', **kwargs)
+        Parameters
+        ----------
 
-        ``spy(Z)`` plots the sparsity pattern of the 2-D array *Z*.
+        Z : sparse array (n, m)
+            The array to be plotted.
 
-        If *precision* is 0, any non-zero value will be plotted;
-        else, values of :math:`|Z| > precision` will be plotted.
+        precision : float, optional, default: 0
+            If *precision* is 0, any non-zero value will be plotted; else,
+            values of :math:`|Z| > precision` will be plotted.
 
-        For :class:`scipy.sparse.spmatrix` instances, there is a
-        special case: if *precision* is 'present', any value present in
-        the array will be plotted, even if it is identically zero.
+            For :class:`scipy.sparse.spmatrix` instances, there is a special
+            case: if *precision* is 'present', any value present in the array
+            will be plotted, even if it is identically zero.
 
-        The array will be plotted as it would be printed, with
-        the first index (row) increasing down and the second
-        index (column) increasing to the right.
+        origin : ["upper", "lower"], optional, default: "upper"
+            Place the [0,0] index of the array in the upper left or lower left
+            corner of the axes.
 
-        By default aspect is 'equal', so that each array element
-        occupies a square space; set the aspect kwarg to 'auto'
-        to allow the plot to fill the plot box, or to any scalar
-        number to specify the aspect ratio of an array element
-        directly.
+        aspect : ['auto' | 'equal' | scalar], optional, default: "equal"
+
+            If 'equal', and `extent` is None, changes the axes aspect ratio to
+            match that of the image. If `extent` is not `None`, the axes
+            aspect ratio is changed to match that of the extent.
+
+
+            If 'auto', changes the image aspect ratio to match that of the
+            axes.
+
+            If None, default to rc ``image.aspect`` value.
 
         Two plotting styles are available: image or marker. Both
         are available for full arrays, but only the marker style
@@ -6612,33 +6620,10 @@ def spy(self, Z, precision=0, marker=None, markersize=None,
         * *cmap*
         * *alpha*
 
-        .. seealso::
-
-            :func:`~matplotlib.pyplot.imshow`
-               For image options.
-
-        For controlling colors, e.g., cyan background and red marks,
-        use::
-
-          cmap = mcolors.ListedColormap(['c','r'])
-
-        If *marker* or *markersize* is not *None*, useful kwargs include:
-
-        * *marker*
-        * *markersize*
-        * *color*
-
-        Useful values for *marker* include:
-
-        * 's'  square (default)
-        * 'o'  circle
-        * '.'  point
-        * ','  pixel
-
-        .. seealso::
-
-            :func:`~matplotlib.pyplot.plot`
-               For plotting options
+        See also
+        --------
+        imshow : for image options.
+        plot : for plotting options
         """
         if marker is None and markersize is None and hasattr(Z, 'tocoo'):
             marker = 's'
@@ -6652,7 +6637,7 @@ def spy(self, Z, precision=0, marker=None, markersize=None,
             nr, nc = Z.shape
             extent = [-0.5, nc - 0.5, nr - 0.5, -0.5]
             ret = self.imshow(mask, interpolation='nearest', aspect=aspect,
-                                extent=extent, origin='upper', **kwargs)
+                                extent=extent, origin=origin, **kwargs)
         else:
             if hasattr(Z, 'tocoo'):
                 c = Z.tocoo()
