MNT: add exception for invalid kwargs to LogScale

tacaswell · tacaswell · commit 63572455d605 · 2017-10-21T23:30:03.000-04:00
diff --git a/lib/matplotlib/scale.py b/lib/matplotlib/scale.py
@@ -235,6 +235,12 @@ def __init__(self, axis, **kwargs):
             subs = kwargs.pop('subsy', None)
             nonpos = kwargs.pop('nonposy', 'clip')
 
+        if len(kwargs):
+            raise ValueError(("provided too many kwargs, can only pass "
+                              "{'basex', 'subsx', nonposx'} or "
+                              "{'basey', 'subsy', nonposy'}.  You passed ") +
+                             "{!r}".format(kwargs))
+
         if nonpos not in ['mask', 'clip']:
             raise ValueError("nonposx, nonposy kwarg must be 'mask' or 'clip'")
 
diff --git a/lib/matplotlib/tests/test_scale.py b/lib/matplotlib/tests/test_scale.py
@@ -4,6 +4,7 @@
 import matplotlib.pyplot as plt
 import numpy as np
 import io
+import pytest
 
 
 @image_comparison(baseline_images=['log_scales'], remove_text=True)
@@ -65,3 +66,10 @@ def test_logscale_mask():
     ax.plot(np.exp(-xs**2))
     fig.canvas.draw()
     ax.set(yscale="log")
+
+
+def test_extra_kwargs_raise():
+    fig, ax = plt.subplots()
+    with pytest.raises(ValueError):
+        ax.set_yscale('log', nonpos='mask')
+
