MNT: be more careful about not converting an array to a bool

tacaswell · tacaswell · commit 55e16ca4c24a · 2020-07-07T12:02:20.000-04:00
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -4452,7 +4452,9 @@ def scatter(self, x, y, s=None, c=None, marker=None, cmap=None, norm=None,
         if len(s) not in (1, x.size):
             raise ValueError("s must be a scalar, or the same size as x and y")
         # get the original edgecolor the user passed before we normalize
-        orig_edgecolor = edgecolors or kwargs.get('edgecolor', None)
+        orig_edgecolor = (edgecolors
+                          if edgecolors is not None
+                          else kwargs.get('edgecolor', None))
         c, colors, edgecolors = \
             self._parse_scatter_color_args(
                 c, edgecolors, kwargs, x.size,
