Merge pull request #10772 from jklymak/api-check-locatorargs

timhoffm · web-flow · commit 8a27054235af · 2018-03-14T07:41:18.000+01:00
API: check locator and formatter args when passed
diff --git a/lib/matplotlib/axis.py b/lib/matplotlib/axis.py
@@ -1568,6 +1568,9 @@ def set_major_formatter(self, formatter):
 
         ACCEPTS: A :class:`~matplotlib.ticker.Formatter` instance
         """
+        if not isinstance(formatter, mticker.Formatter):
+            raise TypeError("formatter argument should be instance of "
+                    "matplotlib.ticker.Formatter")
         self.isDefault_majfmt = False
         self.major.formatter = formatter
         formatter.set_axis(self)
@@ -1579,6 +1582,9 @@ def set_minor_formatter(self, formatter):
 
         ACCEPTS: A :class:`~matplotlib.ticker.Formatter` instance
         """
+        if not isinstance(formatter, mticker.Formatter):
+            raise TypeError("formatter argument should be instance of "
+                    "matplotlib.ticker.Formatter")
         self.isDefault_minfmt = False
         self.minor.formatter = formatter
         formatter.set_axis(self)
@@ -1590,6 +1596,9 @@ def set_major_locator(self, locator):
 
         ACCEPTS: a :class:`~matplotlib.ticker.Locator` instance
         """
+        if not isinstance(locator, mticker.Locator):
+            raise TypeError("formatter argument should be instance of "
+                    "matplotlib.ticker.Locator")
         self.isDefault_majloc = False
         self.major.locator = locator
         locator.set_axis(self)
@@ -1601,6 +1610,9 @@ def set_minor_locator(self, locator):
 
         ACCEPTS: a :class:`~matplotlib.ticker.Locator` instance
         """
+        if not isinstance(locator, mticker.Locator):
+            raise TypeError("formatter argument should be instance of "
+                    "matplotlib.ticker.Locator")
         self.isDefault_minloc = False
         self.minor.locator = locator
         locator.set_axis(self)
diff --git a/lib/matplotlib/tests/test_ticker.py b/lib/matplotlib/tests/test_ticker.py
@@ -728,3 +728,27 @@ def test_latex(self, is_latex, usetex, expected):
         fmt = mticker.PercentFormatter(symbol='\\{t}%', is_latex=is_latex)
         with matplotlib.rc_context(rc={'text.usetex': usetex}):
             assert fmt.format_pct(50, 100) == expected
+
+
+def test_majformatter_type():
+    fig, ax = plt.subplots()
+    with pytest.raises(TypeError):
+        ax.xaxis.set_major_formatter(matplotlib.ticker.LogLocator())
+
+
+def test_minformatter_type():
+    fig, ax = plt.subplots()
+    with pytest.raises(TypeError):
+        ax.xaxis.set_minor_formatter(matplotlib.ticker.LogLocator())
+
+
+def test_majlocator_type():
+    fig, ax = plt.subplots()
+    with pytest.raises(TypeError):
+        ax.xaxis.set_major_locator(matplotlib.ticker.LogFormatter())
+
+
+def test_minlocator_type():
+    fig, ax = plt.subplots()
+    with pytest.raises(TypeError):
+        ax.xaxis.set_minor_locator(matplotlib.ticker.LogFormatter())
