Merge pull request #15883 from anntzer/scatter-unsized

jklymak · web-flow · commit 3c58e2a0e94a · 2019-12-11T21:31:08.000-08:00
Improve error when passing 0d array to scatter().
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -1,4 +1,3 @@
-import collections.abc
 import functools
 import itertools
 import logging
@@ -4204,7 +4203,7 @@ def _parse_scatter_color_args(c, edgecolors, kwargs, xsize,
                  else get_next_color_func())
         c_is_string_or_strings = (
             isinstance(c, str)
-            or (isinstance(c, collections.abc.Iterable) and len(c) > 0
+            or (np.iterable(c) and len(c) > 0
                 and isinstance(cbook.safe_first_element(c), str)))
 
         def invalid_shape_exception(csize, xsize):
@@ -4238,7 +4237,7 @@ def invalid_shape_exception(csize, xsize):
         if not c_is_mapped:
             try:  # Is 'c' acceptable as PathCollection facecolors?
                 colors = mcolors.to_rgba_array(c)
-            except ValueError:
+            except (TypeError, ValueError):
                 if not valid_shape:
                     raise invalid_shape_exception(c.size, xsize)
                 # Both the mapping *and* the RGBA conversion failed: pretty
