Merge pull request #23440 from meeseeksmachine/auto-backport-of-pr-23430-on-v3.5.x

timhoffm · web-flow · commit 4d02bc913074 · 2022-07-18T08:58:33.000+02:00
Backport PR #23430 on branch v3.5.x (Fix divide by 0 runtime warning)
diff --git a/lib/mpl_toolkits/mplot3d/proj3d.py b/lib/mpl_toolkits/mplot3d/proj3d.py
@@ -21,7 +21,7 @@ def _line2d_seg_dist(p1, p2, p0):
 
     x01 = np.asarray(p0[0]) - p1[0]
     y01 = np.asarray(p0[1]) - p1[1]
-    if np.all(p1 == p2):
+    if np.all(p1[0:2] == p2[0:2]):
         return np.hypot(x01, y01)
 
     x21 = p2[0] - p1[0]
diff --git a/lib/mpl_toolkits/tests/test_mplot3d.py b/lib/mpl_toolkits/tests/test_mplot3d.py
@@ -1004,11 +1004,13 @@ def test_lines_dists():
 def test_lines_dists_nowarning():
     # Smoke test to see that no RuntimeWarning is emitted when two first
     # arguments are the same, see GH#22624
-    p0 = (10, 30)
-    p1 = (20, 150)
-    proj3d._line2d_seg_dist(p0, p0, p1)
+    p0 = (10, 30, 50)
+    p1 = (10, 30, 20)
+    p2 = (20, 150)
+    proj3d._line2d_seg_dist(p0, p0, p2)
+    proj3d._line2d_seg_dist(p0, p1, p2)
     p0 = np.array(p0)
-    proj3d._line2d_seg_dist(p0, p0, p1)
+    proj3d._line2d_seg_dist(p0, p0, p2)
 
 
 def test_autoscale():
