Fix problems related to streamplot in boilerplate.py

Author: mdboom

boilerplate.py

@@ -169,7 +169,7 @@ def boilerplate_gen():
         #'spy'    :  'sci(%(ret)s)',  ### may return image or Line2D
         'quiver' :  'sci(%(ret)s)',
         'specgram'  : 'sci(%(ret)s[-1])',
-        'streamplot' :  'sci(%(ret)s)',
+        'streamplot' :  'sci(%(ret)s.lines)',
         'tricontour' : 'if %(ret)s._A is not None: sci(%(ret)s)',
         'tricontourf': 'if %(ret)s._A is not None: sci(%(ret)s)',
         'tripcolor'  : 'sci(%(ret)s)',

lib/matplotlib/pyplot.py

@@ -2932,8 +2932,8 @@ def quiverkey(*args, **kw):
 # changes will be lost
 @_autogen_docstring(Axes.scatter)
 def scatter(x, y, s=20, c='b', marker='o', cmap=None, norm=None, vmin=None,
-            vmax=None, alpha=None, linewidths=None, faceted=True, verts=None,
-            hold=None, **kwargs):
+            vmax=None, alpha=None, linewidths=None, verts=None, hold=None,
+            **kwargs):
     ax = gca()
     # allow callers to override the hold state by passing hold=True|False
     washold = ax.ishold()
@@ -2943,8 +2943,7 @@ def scatter(x, y, s=20, c='b', marker='o', cmap=None, norm=None, vmin=None,
     try:
         ret = ax.scatter(x, y, s=s, c=c, marker=marker, cmap=cmap, norm=norm,
                          vmin=vmin, vmax=vmax, alpha=alpha,
-                         linewidths=linewidths, faceted=faceted, verts=verts,
-                         **kwargs)
+                         linewidths=linewidths, verts=verts, **kwargs)
         draw_if_interactive()
     finally:
         ax.hold(washold)