pyplot.spy should set current image only if it is making an image

svn path=/trunk/matplotlib/; revision=8052

Author: efiring

boilerplate.py

@@ -86,7 +86,7 @@ def %(func)s(%(argspec)s):
     'semilogx',
     'semilogy',
     'specgram',
-    'spy',
+    #'spy',
     'stem',
     'step',
     'vlines',
@@ -111,7 +111,7 @@ def %(func)s(%(argspec)s):
     'pcolor'  : 'sci(%(ret)s)',
     'pcolormesh': 'sci(%(ret)s)',
     'imshow'  : 'sci(%(ret)s)',
-    'spy'    :  'sci(%(ret)s)',
+    #'spy'    :  'sci(%(ret)s)',  ### may return image or Line2D
     'quiver' :  'sci(%(ret)s)',
     'specgram'  : 'sci(%(ret)s[-1])',
 

lib/matplotlib/pyplot.py

@@ -1600,6 +1600,27 @@ def autogen_docstring(base):
     addendum = docstring.Appender(msg, '\n\n')
     return lambda func: addendum(docstring.copy_dedent(base)(func))
 
+
+# This function cannot be generated by boilerplate.py because it may
+# return an image or a line.
+@autogen_docstring(Axes.spy)
+def spy(Z, precision=0, marker=None, markersize=None, aspect='equal', hold=None, **kwargs):
+    ax = gca()
+    # allow callers to override the hold state by passing hold=True|False
+    washold = ax.ishold()
+
+    if hold is not None:
+        ax.hold(hold)
+    try:
+        ret = ax.spy(Z, precision, marker, markersize, aspect, **kwargs)
+        draw_if_interactive()
+    finally:
+        ax.hold(washold)
+    if isinstance(ret, cm.ScalarMappable):
+        sci(ret)
+    return ret
+
+
 ## Plotting part 2: autogenerated wrappers for axes methods ##
 
 # This function was autogenerated by boilerplate.py.  Do not edit as
@@ -2252,23 +2273,6 @@ def specgram(x, NFFT=256, Fs=2, Fc=0, detrend=mlab.detrend_none, window=mlab.win
     sci(ret[-1])
     return ret
 
-# This function was autogenerated by boilerplate.py.  Do not edit as
-# changes will be lost
-@autogen_docstring(Axes.spy)
-def spy(Z, precision=0, marker=None, markersize=None, aspect='equal', hold=None, **kwargs):
-    ax = gca()
-    # allow callers to override the hold state by passing hold=True|False
-    washold = ax.ishold()
-
-    if hold is not None:
-        ax.hold(hold)
-    try:
-        ret = ax.spy(Z, precision, marker, markersize, aspect, **kwargs)
-        draw_if_interactive()
-    finally:
-        ax.hold(washold)
-    sci(ret)
-    return ret
 
 # This function was autogenerated by boilerplate.py.  Do not edit as
 # changes will be lost