Merge pull request #18488 from meeseeksmachine/auto-backport-of-pr-18483-on-v3.3.x

QuLogic · web-flow · commit 6a94a1f11204 · 2020-09-15T01:14:44.000-04:00
Backport PR #18483 on branch v3.3.x (DOC: reword non-monotonic cell center warning)
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -5633,12 +5633,11 @@ def _interp_grid(X):
                         if not (np.all(dX >= 0) or np.all(dX <= 0)):
                             cbook._warn_external(
                                 f"The input coordinates to {funcname} are "
-                                "not all either increasing or decreasing, "
-                                "the automatically computed edges can "
-                                "produce misleading results in this case. "
-                                "It is recommended to supply the "
-                                f"quadrilateral edges to {funcname}"
-                                f" yourself. See help({funcname}).")
+                                "interpreted as cell centers, but are not "
+                                "monotonically increasing or decreasing. "
+                                "This may lead to incorrectly calculated cell "
+                                "edges, in which case, please supply "
+                                f"explicit cell edges to {funcname}.")
                         X = np.hstack((X[:, [0]] - dX[:, [0]],
                                        X[:, :-1] + dX,
                                        X[:, [-1]] + dX[:, [-1]]))
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
@@ -1167,7 +1167,8 @@ def test_pcolorargs():
     y = [-10, 10]
     X, Y = np.meshgrid(x, y)
     Z = np.zeros(X.shape)
-    with pytest.warns(UserWarning, match="The input coordinates"):
+    with pytest.warns(UserWarning,
+                      match='are not monotonically increasing or decreasing'):
         ax.pcolormesh(X, Y, Z, shading='auto')
 
 
