diff options
| author | Takayuki SHIMIZUKAWA <shimizukawa@gmail.com> | 2016-10-19 00:54:38 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-19 00:54:38 +0900 |
| commit | 340c6fb9f435329784f0961d434cfa51dd501e8d (patch) | |
| tree | 53261a6a227504673ceb8cc5ff11919c595e9437 /sphinx/ext/autodoc.py | |
| parent | 6438cf54dbc0316ee7d4191eb9719971c62648de (diff) | |
| parent | 0beabaf4cfbbe6963fd7f5d5d9fe043d2e3163a4 (diff) | |
| download | sphinx-git-340c6fb9f435329784f0961d434cfa51dd501e8d.tar.gz | |
Merge pull request #2432 from agronholm/kwonlyargs
#2432 Fix unwanted * between varargs and keyword only args
Diffstat (limited to 'sphinx/ext/autodoc.py')
| -rw-r--r-- | sphinx/ext/autodoc.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sphinx/ext/autodoc.py b/sphinx/ext/autodoc.py index bfbbbea72..6a1d907fd 100644 --- a/sphinx/ext/autodoc.py +++ b/sphinx/ext/autodoc.py @@ -369,7 +369,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)) |