Merge pull request #26532 from stevezhang1999/fix-poly3dcollection

oscargus · web-flow · commit 267b7c08bf39 · 2023-08-16T10:43:09.000+02:00
Fix input check in Poly3DCollection.__init__
diff --git a/lib/mpl_toolkits/mplot3d/art3d.py b/lib/mpl_toolkits/mplot3d/art3d.py
@@ -905,7 +905,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
@@ -2260,3 +2260,13 @@ def test_surface3d_zsort_inf():
 
     ax.plot_surface(x, y, z, cmap='jet')
     ax.view_init(elev=45, azim=145)
+
+
+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
`@@ -905,7 +905,7 @@ def __init__(self, verts, *args, zsort='average', shade=False,`
`905`	`905`	`kwargs['edgecolors'] = _shade_colors(`
`906`	`906`	`edgecolors, normals, lightsource`
`907`	`907`	`)`
`908`		`- if facecolors is None and edgecolors in None:`
	`908`	`+ if facecolors is None and edgecolors is None:`
`909`	`909`	`raise ValueError(`
`910`	`910`	`"You must provide facecolors, edgecolors, or both for "`
`911`	`911`	`"shade to work.")`