Fix staticmethod bug

Author: johnslavik

Lib/functools.py

@@ -1100,9 +1100,20 @@ def __call__(self, /, *args, **kwargs):
             method = self._dispatch(args[1].__class__)
         else:
             method = self._dispatch(args[0].__class__)
+
         if hasattr(method, "__get__"):
+            # If the method is a descriptor, it might be necessary
+            # to drop the first argument before calling
+            # as it can be no longer expected after descriptor access.
+            skip_first_arg = False
+            if isinstance(method, staticmethod):
+                skip_first_arg = self._skip_bound_arg
+
             method = method.__get__(self._obj, self._cls)
-            if self._skip_bound_arg and isinstance(method, MethodType):
+            if isinstance(method, MethodType):
+                skip_first_arg = self._skip_bound_arg
+
+            if skip_first_arg:
                 return method(*args[1:], **kwargs)
         return method(*args, **kwargs)
 

Lib/test/test_functools.py

@@ -3023,7 +3023,7 @@ def special2(self, x: float):
 
             @generic.register
             @staticmethod
-            def special3(self, x: complex):
+            def special3(x: complex):
                 return "special3"
 
             def special4(self, x):