Fix max_positional_arguments, fix tests

Author: fgallaire

pylint/checkers/design_analysis.py

@@ -563,8 +563,12 @@ def visit_functiondef(self, node: nodes.FunctionDef) -> None:
             argnum = len(args) - ignored_args_num
             if node.type in {"function", "staticmethod"}:
                 max_args = self.linter.config.max_args
+                max_positional_arguments = self.linter.config.max_positional_arguments
             elif node.type in {"method", "classmethod"}:
                 max_args = self.linter.config.max_args + 1
+                max_positional_arguments = (
+                    self.linter.config.max_positional_arguments + 1
+                )
             if argnum > max_args:
                 self.add_message(
                     "too-many-arguments",
@@ -574,11 +578,11 @@ def visit_functiondef(self, node: nodes.FunctionDef) -> None:
             pos_args_count = (
                 len(args) - len(node.args.kwonlyargs) - ignored_pos_args_num
             )
-            if pos_args_count > self.linter.config.max_positional_arguments:
+            if pos_args_count > max_positional_arguments:
                 self.add_message(
                     "too-many-positional-arguments",
                     node=node,
-                    args=(pos_args_count, self.linter.config.max_positional_arguments),
+                    args=(pos_args_count, max_positional_arguments),
                     confidence=HIGH,
                 )
         else:

tests/functional/t/too/too_many_positional_arguments.py

@@ -1,9 +1,9 @@
 # pylint: disable=missing-function-docstring, missing-module-docstring
 class FiveArgumentMethods:
-    """The max positional arguments default is 5."""
-    def fail1(self, a, b, c, d, e):  # [too-many-arguments, too-many-positional-arguments]
+    """The max positional arguments default is 5, so 6 for a method because of self."""
+    def fail1(self, a, b, c, d, e, f):  # [too-many-arguments, too-many-positional-arguments]
         pass
-    def fail2(self, a, b, c, d, /, e):  # [too-many-arguments, too-many-positional-arguments]
+    def fail2(self, a, b, c, d, e, /, f):  # [too-many-arguments, too-many-positional-arguments]
         pass
-    def okay1(self, a, b, c, d, *, e=True):  # [too-many-arguments]
+    def okay1(self, a, b, c, d, e, *, f=True):  # [too-many-arguments]
         pass

tests/functional/t/too/too_many_positional_arguments.txt

@@ -1,5 +1,5 @@
-too-many-arguments:4:4:4:13:FiveArgumentMethods.fail1:Too many arguments (6/5):UNDEFINED
-too-many-positional-arguments:4:4:4:13:FiveArgumentMethods.fail1:Too many positional arguments (6/5):HIGH
-too-many-arguments:6:4:6:13:FiveArgumentMethods.fail2:Too many arguments (6/5):UNDEFINED
-too-many-positional-arguments:6:4:6:13:FiveArgumentMethods.fail2:Too many positional arguments (6/5):HIGH
-too-many-arguments:8:4:8:13:FiveArgumentMethods.okay1:Too many arguments (6/5):UNDEFINED
+too-many-arguments:4:4:4:13:FiveArgumentMethods.fail1:Too many arguments (7/6):UNDEFINED
+too-many-positional-arguments:4:4:4:13:FiveArgumentMethods.fail1:Too many positional arguments (7/6):HIGH
+too-many-arguments:6:4:6:13:FiveArgumentMethods.fail2:Too many arguments (7/6):UNDEFINED
+too-many-positional-arguments:6:4:6:13:FiveArgumentMethods.fail2:Too many positional arguments (7/6):HIGH
+too-many-arguments:8:4:8:13:FiveArgumentMethods.okay1:Too many arguments (7/6):UNDEFINED