stubgen: don't append star arg when args list already has varargs appended (#4518)

* stubgen: don't append star arg when args list already has varargs appended (#3985)

* fixed flake warning

Author: hoefling

mypy/stubgen.py

@@ -457,7 +457,8 @@ def visit_func_def(self, o: FuncDef) -> None:
                 annotation = ""
             if arg_.initializer:
                 initializer = '...'
-                if kind in (ARG_NAMED, ARG_NAMED_OPT) and '*' not in args:
+                if kind in (ARG_NAMED, ARG_NAMED_OPT) and not any(arg.startswith('*')
+                                                                  for arg in args):
                     args.append('*')
                 if not annotation:
                     typename = self.get_str_type_of_node(arg_.initializer, True)

test-data/unit/stubgen.test

@@ -82,6 +82,19 @@ def f(x, **y): ...
 [out]
 def f(x, **y) -> None: ...
 
+[case testVarArgsWithKwVarArgs]
+def f(a, *b, **c): ...
+def g(a, *b, c=1): ...
+def h(a, *b, c=1, **d): ...
+def i(a, *, b=1): ...
+def j(a, *, b=1, **c): ...
+[out]
+def f(a, *b, **c) -> None: ...
+def g(a, *b, c: int = ...) -> None: ...
+def h(a, *b, c: int = ..., **d) -> None: ...
+def i(a, *, b: int = ...) -> None: ...
+def j(a, *, b: int = ..., **c) -> None: ...
+
 [case testClass]
 class A:
     def f(self, x):