Merge pull request #26544 from QuLogic/auto-backport-of-pr-26532-on-v3.7.x

oscargus · web-flow · commit 73985d9ceeab · 2023-08-18T12:09:12.000+02:00
Backport PR #26532: Fix input check in Poly3DCollection.__init__
diff --git a/lib/mpl_toolkits/mplot3d/art3d.py b/lib/mpl_toolkits/mplot3d/art3d.py
@@ -880,7 +880,7 @@ def __init__(self, verts, *args, zsort='average', shade=False,
                 kwargs['edgecolors'] = _shade_colors(
                     edgecolors, normals, lightsource
                 )
-            if facecolors is None and edgecolors in None:
+            if facecolors is None and edgecolors is None:
                 raise ValueError(
                     "You must provide facecolors, edgecolors, or both for "
                     "shade to work.")
diff --git a/lib/mpl_toolkits/mplot3d/tests/test_axes3d.py b/lib/mpl_toolkits/mplot3d/tests/test_axes3d.py
@@ -2176,3 +2176,13 @@ def test_mutating_input_arrays_y_and_z(fig_test, fig_ref):
     y = [0.0, 0.0, 0.0]
     z = [0.0, 0.0, 0.0]
     ax2.plot(x, y, z, 'o-')
+
+
+def test_Poly3DCollection_init_value_error():
+    # smoke test to ensure the input check works
+    # GH#26420
+    with pytest.raises(ValueError,
+                       match='You must provide facecolors, edgecolors, '
+                        '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)

Original file line number	Diff line number	Diff line change
`@@ -880,7 +880,7 @@ def __init__(self, verts, *args, zsort='average', shade=False,`
`880`	`880`	`kwargs['edgecolors'] = _shade_colors(`
`881`	`881`	`edgecolors, normals, lightsource`
`882`	`882`	`)`
`883`		`- if facecolors is None and edgecolors in None:`
	`883`	`+ if facecolors is None and edgecolors is None:`
`884`	`884`	`raise ValueError(`
`885`	`885`	`"You must provide facecolors, edgecolors, or both for "`
`886`	`886`	`"shade to work.")`