fix naming of 'c' and drop the adjective 'named'

afvincent · afvincent · commit e9cdfc007032 · 2018-07-10T18:11:17.000-07:00
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -3878,15 +3878,15 @@ def scatter(self, x, y, s=None, c=None, marker=None, cmap=None, norm=None,
             except ValueError:
                 raise ValueError("'color' kwarg must be an mpl color"
                                  " spec or sequence of color specs.\n"
-                                 "For a sequence of values to be"
-                                 " color-mapped, use the 'c' kwarg instead.")
+                                 "For a sequence of values to be color-mapped,"
+                                 " use the 'c' argument instead.")
             if edgecolors is None:
                 edgecolors = co
             if facecolors is None:
                 facecolors = co
             if c is not None:
-                raise ValueError("Supply a 'c' kwarg or a 'color' kwarg"
-                                 " but not both; they differ but"
+                raise ValueError("Supply a 'c' argument or a 'color'"
+                                 " kwarg but not both; they differ but"
                                  " their functionalities overlap.")
         if c is None:
             if facecolors is not None:
@@ -3943,7 +3943,7 @@ def scatter(self, x, y, s=None, c=None, marker=None, cmap=None, norm=None,
                 else:
                     if c_array.shape in ((3,), (4,)):
                         _log.warning(
-                            "'c' kwarg looks like a **single** numeric RGB or "
+                            "'c' argument looks like a single numeric RGB or "
                             "RGBA sequence, which should be avoided as value-"
                             "mapping will have precedence in case its length "
                             "matches with 'x' & 'y'.  Please use a 2-D array "
@@ -3968,15 +3968,16 @@ def scatter(self, x, y, s=None, c=None, marker=None, cmap=None, norm=None,
             except ValueError:
                 if not valid_shape:  # but at least one conversion succeeded.
                     raise ValueError(
-                        "'c' kwarg has {nc} elements, which is not acceptable "
-                        "for use with 'x' with size {xs}, 'y' with size {ys}."
+                        "'c' argument has {nc} elements, which is not "
+                        "acceptable for use with 'x' with size {xs}, "
+                        "'y' with size {ys}."
                         .format(nc=n_elem, xs=x.size, ys=y.size)
                     )
                 # Both the mapping *and* the RGBA conversion failed: pretty
                 # severe failure => one may appreciate a verbose feedback.
                 raise ValueError(
-                    "'c' kwarg must either be valid as mpl color(s) or "
-                    "as numbers to be mapped to colors. "
+                    "'c' argument must either be valid as mpl color(s) "
+                    "or as numbers to be mapped to colors. "
                     "Here c = {}."  # <- beware, could be long depending on c.
                     .format(c)
                 )
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
@@ -1716,10 +1716,10 @@ def test_scatter_color(self):
         with pytest.raises(ValueError):
             plt.scatter([1, 2, 3], [1, 2, 3], color=[1, 2, 3])
 
-    # Parameters for *test_scatter_c_kwarg*. NB: assuming that
-    # the scatter plot will have 4 elements. The tuple scheme is:
+    # Parameters for *test_scatter_c*. NB: assuming that the
+    # scatter plot will have 4 elements. The tuple scheme is:
     # (*c* parameter case, exception regexp key or None if no exception)
-    params_scatter_c_kwarg = [
+    params_test_scatter_c = [
         # Single letter-sequences
         ("rgby", None),
         ("rgb", "shape"),
@@ -1759,12 +1759,13 @@ def test_scatter_color(self):
         ([[1, 0, 0, 0.5], "red", "0.0", "C5", "jaune"], "conversion"),
     ]
 
-    @pytest.mark.parametrize('c_case, re_key', params_scatter_c_kwarg)
-    def test_scatter_c_kwarg(self, c_case, re_key):
+    @pytest.mark.parametrize('c_case, re_key', params_test_scatter_c)
+    def test_scatter_c(self, c_case, re_key):
         # Additional checking of *c* (introduced in #11383).
-        REGEXP = {"shape": "^'c' kwarg has [0-9]+ elements",  # shape mismatch
-                  "conversion": "^'c' kwarg must either be valid",  # bad vals
-                  }
+        REGEXP = {
+            "shape": "^'c' argument has [0-9]+ elements",  # shape mismatch
+            "conversion": "^'c' argument must either be valid",  # bad vals
+            }
         x = y = [0, 1, 2, 3]
         fig, ax = plt.subplots()
 
