Improve order of keyword-only args in argnames() (#1387)

Author: jacobtylerwalls

astroid/nodes/scoped_nodes/scoped_nodes.py

@@ -1369,7 +1369,7 @@ def callable(self):
     def argnames(self) -> List[str]:
         """Get the names of each of the arguments, including that
         of the collections of variable-length arguments ("args", "kwargs",
-        etc.), as well as keyword-only arguments.
+        etc.), as well as positional-only and keyword-only arguments.
 
         :returns: The names of the arguments.
         :rtype: list(str)
@@ -1378,9 +1378,9 @@ def argnames(self) -> List[str]:
             names = _rec_get_names(self.args.arguments)
         else:
             names = []
-        names += [elt.name for elt in self.args.kwonlyargs]
         if self.args.vararg:
             names.append(self.args.vararg)
+        names += [elt.name for elt in self.args.kwonlyargs]
         if self.args.kwarg:
             names.append(self.args.kwarg)
         return names

tests/unittest_scoped_nodes.py

@@ -473,9 +473,19 @@ def test_argnames(self) -> None:
         astroid = builder.parse(code, __name__)
         self.assertEqual(astroid["f"].argnames(), ["a", "b", "c", "args", "kwargs"])
 
-        code_with_kwonly_args = "def f(a, b, *, c=None, d=None): pass"
+        code_with_kwonly_args = "def f(a, b, *args, c=None, d=None, **kwargs): pass"
         astroid = builder.parse(code_with_kwonly_args, __name__)
-        self.assertEqual(astroid["f"].argnames(), ["a", "b", "c", "d"])
+        self.assertEqual(
+            astroid["f"].argnames(), ["a", "b", "args", "c", "d", "kwargs"]
+        )
+
+    @unittest.skipUnless(PY38_PLUS, "positional-only argument syntax")
+    def test_positional_only_argnames(self) -> None:
+        code = "def f(a, b, /, c=None, *args, d, **kwargs): pass"
+        astroid = builder.parse(code, __name__)
+        self.assertEqual(
+            astroid["f"].argnames(), ["a", "b", "c", "args", "d", "kwargs"]
+        )
 
     def test_return_nothing(self) -> None:
         """test inferred value on a function with empty return"""