Merge pull request #26836 from meeseeksmachine/auto-backport-of-pr-26834-on-v3.8.x

QuLogic · web-flow · commit 325aa89cb69c · 2023-09-20T03:49:06.000-04:00
Backport PR #26834 on branch v3.8.x (Fix Issue 26821: [Bug]: ValueError: The truth value... when an ndarray is passed to the color kwarg of axes3d.scatter)
diff --git a/lib/mpl_toolkits/mplot3d/axes3d.py b/lib/mpl_toolkits/mplot3d/axes3d.py
@@ -2374,7 +2374,7 @@ def scatter(self, xs, ys, zs=0, zdir='z', s=20, c=None, depthshade=True,
         xs, ys, zs, s, c, color = cbook.delete_masked_points(
             xs, ys, zs, s, c, kwargs.get('color', None)
             )
-        if kwargs.get('color', None):
+        if kwargs.get("color") is not None:
             kwargs['color'] = color
 
         # For xs and ys, 2D scatter() will do the copying.
diff --git a/lib/mpl_toolkits/mplot3d/tests/test_axes3d.py b/lib/mpl_toolkits/mplot3d/tests/test_axes3d.py
@@ -2270,3 +2270,12 @@ def test_Poly3DCollection_init_value_error():
                         'or both for shade to work.'):
         poly = np.array([[0, 0, 1], [0, 1, 1], [0, 0, 0]], float)
         c = art3d.Poly3DCollection([poly], shade=True)
+
+
+def test_ndarray_color_kwargs_value_error():
+    # smoke test
+    # ensures ndarray can be passed to color in kwargs for 3d projection plot
+    fig = plt.figure()
+    ax = fig.add_subplot(111, projection='3d')
+    ax.scatter(1, 0, 0, color=np.array([0, 0, 0, 1]))
+    fig.canvas.draw()

Original file line number	Diff line number	Diff line change
`@@ -2374,7 +2374,7 @@ def scatter(self, xs, ys, zs=0, zdir='z', s=20, c=None, depthshade=True,`
`2374`	`2374`	`xs, ys, zs, s, c, color = cbook.delete_masked_points(`
`2375`	`2375`	`xs, ys, zs, s, c, kwargs.get('color', None)`
`2376`	`2376`	`)`
`2377`		`- if kwargs.get('color', None):`
	`2377`	`+ if kwargs.get("color") is not None:`
`2378`	`2378`	`kwargs['color'] = color`
`2379`	`2379`
`2380`	`2380`	`# For xs and ys, 2D scatter() will do the copying.`