matplotlib
diff --git a/‎lib/matplotlib/tests/test_ticker.py
Lines changed: 26 additions & 1 deletion b/‎lib/matplotlib/tests/test_ticker.py
Lines changed: 26 additions & 1 deletion
diff --git a/‎lib/matplotlib/ticker.py
Lines changed: 15 additions & 16 deletions b/‎lib/matplotlib/ticker.py
Lines changed: 15 additions & 16 deletions
@@ -1042,6 +1042,7 @@ def test_basic(self):
 
 
 class TestFuncFormatter:
+<<<<<<< HEAD
     tests = [("function, 1 input",
                 (lambda x: f"{x}!", [2], "2!")),
              ("function 2 inputs",
@@ -1051,7 +1052,6 @@ class TestFuncFormatter:
              ("format 2 inputs",
                 ("{}+{}!".format, [2, 3], "2+3!"))]
     ids, data = zip(*tests)
-
     @pytest.mark.parametrize("func, args, expected", data, ids=ids)
     def test_arguments(self, func, args, expected):
         assert expected == mticker.FuncFormatter(func)(*args)
@@ -1067,6 +1067,31 @@ def test_other_builtins(self):
         with pytest.raises(UserWarning, match=r'max is not'):
             mticker.FuncFormatter(max)
 
+=======
+    def test_input_x_pos(self):
+        def func(x, pos):
+            return f"{x}+{pos}"
+        funcform = mticker.FuncFormatter(func)
+        assert "1+2" == funcform(1, 2)
+
+    def text_input_x(self):
+        def func(x):
+            f"hello {x}"
+        funcform = mticker.FuncFormatter(func)
+        assert "hello 0" == funcform(0)
+
+    def test_error(self):
+        with pytest.raises(TypeError, match=r"FuncFormatter*"):
+            def func(x, y, z):
+                " ".join([x, y, z])
+            funcform = mticker.FuncFormatter(func)
+            funcform(1, 2, 3)
+
+    def test_built_in(self):
+        funcform = mticker.FuncFormatter("{} hi!".format)
+        assert "42 hi!" == funcform(42)
+>>>>>>> 103314bfb... flake errors
+
 
 class TestStrMethodFormatter:
     test_data = [
 
@@ -171,7 +171,6 @@
 import math
 import string
 import types
-import warnings
 from numbers import Integral
 
 import numpy as np
@@ -386,25 +385,23 @@ class FuncFormatter(Formatter):
      the corresponding tick label.
     """
     def __init__(self, func):
+        self.func = func
+
         if not isinstance(func, types.BuiltinFunctionType):
-            nargs = len(inspect.signature(func).parameters)
-        elif (func.__name__ == 'format'):
+            self.nargs = len(inspect.signature(func).parameters)
+        elif (isinstance(getattr(func, "__self__"), str) and
+                (getattr(func, "__name__", "") == "format")):
             #check if there's a format spec
-            nargs = len([(_, _, fs, _) for (_, _, fs, _)
-                         in string.Formatter().parse(func.__self__)
-                         if fs is not None])
+            self.nargs = len([(_, _, fs, _) for (_, _, fs, _)
+                              in string.Formatter().parse(func.__self__)
+                              if fs is not None])
         else:
             #finding argcount for other builtins is a mess
-            nargs = 2
-            raise warnings.warn(f"{func.__name__} is not supported "
-                                 "and may not work as expected")
-
-        if nargs == 1:
-            self.func = lambda x, pos: func(x)
-        elif nargs == 2:
-            self.func = func
-        else:
-            raise TypeError(f"{func.__name__} takes {nargs} arguments. "
+            self.nargs = 2
+            cbook._warn_external(f"{func.__name__} is not supported "
+                                  "and may not work as expected")
+        if self.nargs not in [1, 2]:
+            raise TypeError(f"{func.__name__} takes {self.nargs} arguments. "
                              "FuncFormatter functions take at most 2: "
                              "x (required), pos (optional).")
 
@@ -414,6 +411,8 @@ def __call__(self, x, pos=None):
 
         *x* and *pos* are passed through as-is.
         """
+        if self.nargs == 1:
+            return self.func(x)
         return self.func(x, pos)