Merge pull request #14837 from meeseeksmachine/auto-backport-of-pr-14757-on-v3.1.x

QuLogic · web-flow · commit 80ac295ad833 · 2019-07-17T23:23:28.000-04:00
Backport PR #14757 on branch v3.1.x (Remove incorrect color/cmap docstring line in contour.py)
diff --git a/lib/matplotlib/contour.py b/lib/matplotlib/contour.py
@@ -1696,7 +1696,7 @@ def _initialize_x_y(self, z):
             maps the level values to colors.
             Defaults to :rc:`image.cmap`.
 
-            If given, *colors* take precedence over *cmap*.
+            If both *colors* and *cmap* are given, an error is raised.
 
         norm : `~matplotlib.colors.Normalize`, optional
             If a colormap is used, the `.Normalize` instance scales the level
