Fix for scatter not showing points with valid x/y but invalid color - updated

btang02 · anntzer · commit 0eed25a9ba8c · 2018-12-12T12:20:53.000+01:00
- Fixed ambiguous kwarg to a more appropriate, less ambiguous name -&gt; plotinvalid
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -4180,7 +4180,7 @@ def _parse_scatter_color_args(c, edgecolors, kwargs, xshape, yshape,
                       label_namer="y")
     def scatter(self, x, y, s=None, c=None, marker=None, cmap=None, norm=None,
                 vmin=None, vmax=None, alpha=None, linewidths=None,
-                verts=None, edgecolors=None, masked=False,
+                verts=None, edgecolors=None, plotinvalid=False,
                 **kwargs):
         """
         A scatter plot of *y* vs *x* with varying marker size and/or color.
@@ -4257,7 +4257,7 @@ def scatter(self, x, y, s=None, c=None, marker=None, cmap=None, norm=None,
             For non-filled markers, the *edgecolors* kwarg is ignored and
             forced to 'face' internally.
 
-        masked : boolean, optional, default: False
+        plotinvalid : boolean, optional, default: False
             Set to plot valid points with invalid color, in conjunction with
             `~matplotlib.colors.Colormap.set_bad`.
 
@@ -4314,7 +4314,7 @@ def scatter(self, x, y, s=None, c=None, marker=None, cmap=None, norm=None,
                 c, edgecolors, kwargs, xshape, yshape,
                 get_next_color_func=self._get_patches_for_fill.get_next_color)
 
-        if masked is False:
+        if plotinvalid is False:
             # `delete_masked_points` only modifies arguments of the same length
             #  as `x`.
             x, y, s, c, colors, edgecolors, linewidths =\
@@ -4364,7 +4364,7 @@ def scatter(self, x, y, s=None, c=None, marker=None, cmap=None, norm=None,
                 raise ValueError(
                     "'norm' must be an instance of 'mcolors.Normalize'")
 
-            if masked is False:
+            if plotinvalid is False:
                 collection.set_array(c)
             else:
                 collection.set_array(ma.masked_invalid(c))
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
@@ -1759,7 +1759,7 @@ def test_scatter_invalid_color(self, fig_test, fig_ref):
         # stamping fast path, which would result in slightly offset markers.
         ax.scatter(range(4), range(4),
                    c=[1, np.nan, 2, np.nan], s=[1, 2, 3, 4],
-                   cmap=cmap, masked=True)
+                   cmap=cmap, plotinvalid=True)
         ax = fig_ref.subplots()
         cmap = plt.get_cmap("viridis", 16)
         ax.scatter([0, 2], [0, 2], c=[1, 2], s=[1, 3], cmap=cmap)
