Make an error

jklymak · jklymak · commit 67117cc9166f · 2019-12-17T13:57:27.000-08:00
diff --git a/lib/matplotlib/pyplot.py b/lib/matplotlib/pyplot.py
@@ -956,8 +956,8 @@ def subplot(*args, **kwargs):
                              "subplots()?")
     # Check for nrows and ncols, which are not valid subplot args:
     if 'nrows' in kwargs or 'ncols' in kwargs:
-        cbook._warn_external("You have passed nrows and/or ncols to "
-                             "subplot(). Did you mean to use subplots()?")
+        raise TypeError("subplot() got an unexpected keyword argument 'ncols' "
+                         "and/or 'nrows'.  Did you intend to call subplots()?")
 
     fig = gcf()
     a = fig.add_subplot(*args, **kwargs)
diff --git a/lib/matplotlib/tests/test_pyplot.py b/lib/matplotlib/tests/test_pyplot.py
@@ -53,10 +53,8 @@ def test_stackplot_smoke():
     plt.stackplot([1, 2, 3], [1, 2, 3])
 
 
-def test_nrows_warn():
-     with pytest.raises(AttributeError):
-         with pytest.warns(UserWarning) as rec:
-             plt.subplot(nrows=1)
-     with pytest.raises(AttributeError):
-         with pytest.warns(UserWarning) as rec:
-             plt.subplot(ncols=1)
+def test_nrows_error():
+    with pytest.raises(TypeError):
+        plt.subplot(nrows=1)
+    with pytest.raises(TypeError):
+        plt.subplot(ncols=1)
