Merge remote-tracking branch 'matplotlib/v1.5.x' into merge15xto2x

jenshnielsen · jenshnielsen · commit 31d7f087df3f · 2016-05-18T09:55:04.000+01:00
diff --git a/lib/matplotlib/animation.py b/lib/matplotlib/animation.py
@@ -234,12 +234,14 @@ def grab_frame(self, **savefig_kwargs):
             # frame format and dpi.
             self.fig.savefig(self._frame_sink(), format=self.frame_format,
                              dpi=self.dpi, **savefig_kwargs)
-        except RuntimeError:
+        except (RuntimeError, IOError) as e:
             out, err = self._proc.communicate()
             verbose.report('MovieWriter -- Error '
                            'running proc:\n%s\n%s' % (out,
                                                       err), level='helpful')
-            raise
+            raise IOError('Error saving animation to file (cause: {0}) '
+                          'Stdout: {1} StdError: {2}. It may help to re-run '
+                          'with --verbose-debug.'.format(e, out, err))
 
     def _frame_sink(self):
         'Returns the place to which frames should be written.'
@@ -684,13 +686,28 @@ def save(self, filename, writer=None, fps=None, dpi=None, codec=None,
         If nothing is passed, the value of the rcparam `animation.writer` is
         used.
 
+        *dpi* controls the dots per inch for the movie frames. This combined
+        with the figure's size in inches controls the size of the movie.
+
+        *savefig_kwargs* is a dictionary containing keyword arguments to be
+        passed on to the 'savefig' command which is called repeatedly to save
+        the individual frames. This can be used to set tight bounding boxes,
+        for example.
+
+        *extra_anim* is a list of additional `Animation` objects that should
+        be included in the saved movie file. These need to be from the same
+        `matplotlib.Figure` instance. Also, animation frames will just be
+        simply combined, so there should be a 1:1 correspondence between
+        the frames from the different animations.
+
+        These remaining arguments are used to construct a :class:`MovieWriter`
+        instance when necessary and are only considered valid if *writer* is
+        not a :class:`MovieWriter` instance.
+
         *fps* is the frames per second in the movie. Defaults to None,
         which will use the animation's specified interval to set the frames
         per second.
 
-        *dpi* controls the dots per inch for the movie frames. This combined
-        with the figure's size in inches controls the size of the movie.
-
         *codec* is the video codec to be used. Not all codecs are supported
         by a given :class:`MovieWriter`. If none is given, this defaults to the
         value specified by the rcparam `animation.codec`.
@@ -708,18 +725,21 @@ def save(self, filename, writer=None, fps=None, dpi=None, codec=None,
         *metadata* is a dictionary of keys and values for metadata to include
         in the output file. Some keys that may be of use include:
         title, artist, genre, subject, copyright, srcform, comment.
-
-        *extra_anim* is a list of additional `Animation` objects that should
-        be included in the saved movie file. These need to be from the same
-        `matplotlib.Figure` instance. Also, animation frames will just be
-        simply combined, so there should be a 1:1 correspondence between
-        the frames from the different animations.
-
-        *savefig_kwargs* is a dictionary containing keyword arguments to be
-        passed on to the 'savefig' command which is called repeatedly to save
-        the individual frames. This can be used to set tight bounding boxes,
-        for example.
         '''
+        # If the writer is None, use the rc param to find the name of the one
+        # to use
+        if writer is None:
+            writer = rcParams['animation.writer']
+        elif (not is_string_like(writer) and
+                any(arg is not None
+                    for arg in (fps, codec, bitrate, extra_args, metadata))):
+            raise RuntimeError('Passing in values for arguments for arguments '
+                               'fps, codec, bitrate, extra_args, or metadata '
+                               'is not supported when writer is an existing '
+                               'MovieWriter instance. These should instead be '
+                               'passed as arguments when creating the '
+                               'MovieWriter instance.')
+
         if savefig_kwargs is None:
             savefig_kwargs = {}
 
@@ -735,11 +755,6 @@ def save(self, filename, writer=None, fps=None, dpi=None, codec=None,
             # Convert interval in ms to frames per second
             fps = 1000. / self._interval
 
-        # If the writer is None, use the rc param to find the name of the one
-        # to use
-        if writer is None:
-            writer = rcParams['animation.writer']
-
         # Re-use the savefig DPI for ours if none is given
         if dpi is None:
             dpi = rcParams['savefig.dpi']
diff --git a/lib/mpl_toolkits/mplot3d/axes3d.py b/lib/mpl_toolkits/mplot3d/axes3d.py
@@ -2240,7 +2240,9 @@ def scatter(self, xs, ys, zs=0, zdir='z', s=20, c=None, depthshade=True,
                       that *c* should not be a single numeric RGB or RGBA
                       sequence because that is indistinguishable from an array
                       of values to be colormapped.  *c* can be a 2-D array in
-                      which the rows are RGB or RGBA, however.
+                      which the rows are RGB or RGBA, however, including the
+                      case of a single row to specify the same color for
+                      all points.
 
         *depthshade*
                       Whether or not to shade the scatter markers to give
@@ -2271,11 +2273,12 @@ def scatter(self, xs, ys, zs=0, zdir='z', s=20, c=None, depthshade=True,
 
         if c is None:
             c = self._get_lines.get_next_color()
-        cstr = cbook.is_string_like(c) or cbook.is_sequence_of_strings(c)
-        if not cstr:
-            c = np.asanyarray(c)
-            if c.size == xs.size:
-                c = np.ma.ravel(c)
+        else:
+            cstr = cbook.is_string_like(c) or cbook.is_sequence_of_strings(c)
+            if not cstr:
+                c = np.asanyarray(c)
+                if c.size == xs.size:
+                    c = np.ma.ravel(c)
 
         xs, ys, zs, s, c = cbook.delete_masked_points(xs, ys, zs, s, c)
 
diff --git a/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/scatter3d_color.png b/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/scatter3d_color.png
diff --git a/lib/mpl_toolkits/tests/test_mplot3d.py b/lib/mpl_toolkits/tests/test_mplot3d.py
@@ -110,6 +110,17 @@ def test_scatter3d():
                c='b', marker='^')
 
 
+@image_comparison(baseline_images=['scatter3d_color'], remove_text=True,
+                  extensions=['png'])
+def test_scatter3d_color():
+    fig = plt.figure()
+    ax = fig.add_subplot(111, projection='3d')
+    ax.scatter(np.arange(10), np.arange(10), np.arange(10),
+               color='r', marker='o')
+    ax.scatter(np.arange(10, 20), np.arange(10, 20), np.arange(10, 20),
+               color='b', marker='s')
+
+
 @image_comparison(baseline_images=['surface3d'], remove_text=True)
 def test_surface3d():
     fig = plt.figure()
