summaryrefslogtreecommitdiff
path: root/sphinx/ext/autodoc.py
diff options
context:
space:
mode:
authorAlex Grönholm <alex.gronholm@nextday.fi>2016-04-09 17:35:32 +0300
committerAlex Grönholm <alex.gronholm@nextday.fi>2016-04-09 17:35:32 +0300
commit0beabaf4cfbbe6963fd7f5d5d9fe043d2e3163a4 (patch)
treefe7567de197f7023e955ad6cd3437b4d048be0a2 /sphinx/ext/autodoc.py
parent174e61fdb2fef4859b0b93abc139675f0e25dda5 (diff)
downloadsphinx-git-0beabaf4cfbbe6963fd7f5d5d9fe043d2e3163a4.tar.gz
Fix unwanted * between varargs and keyword only args
The * parameter must only be present when a holder for positional variable arguments is not present.
Diffstat (limited to 'sphinx/ext/autodoc.py')
-rw-r--r--sphinx/ext/autodoc.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/sphinx/ext/autodoc.py b/sphinx/ext/autodoc.py
index 7dc89d39a..cea341942 100644
--- a/sphinx/ext/autodoc.py
+++ b/sphinx/ext/autodoc.py
@@ -350,7 +350,9 @@ def formatargspec(function, args, varargs=None, varkw=None, defaults=None,
formatted.append('*' + format_arg_with_annotation(varargs))
if kwonlyargs:
- formatted.append('*')
+ if not varargs:
+ formatted.append('*')
+
for kwarg in kwonlyargs:
arg_fd = StringIO()
arg_fd.write(format_arg_with_annotation(kwarg))