diff options
| author | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2016-11-13 11:19:26 +0900 |
|---|---|---|
| committer | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2016-11-13 11:19:26 +0900 |
| commit | e5786b888cfce77772f2e11d9f2934b941edbc7d (patch) | |
| tree | 742c27dc7da82806aea706ce90872eeb4f2d2f56 /sphinx/ext/autodoc.py | |
| parent | 760b379614880f70f0e5f7295df6f3c772b76745 (diff) | |
| parent | 9f39b53c1640ab47874c5d180d07f338696e4993 (diff) | |
| download | sphinx-git-e5786b888cfce77772f2e11d9f2934b941edbc7d.tar.gz | |
Merge branch 'stable' into 1.5-release
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 9b8bc7e5f..20f4cee0b 100644 --- a/sphinx/ext/autodoc.py +++ b/sphinx/ext/autodoc.py @@ -317,7 +317,9 @@ def format_annotation(annotation): hasattr(annotation, '__result__'): # Skipped in the case of plain typing.Callable args = annotation.__args__ - if args is Ellipsis: + if args is None: + return qualified_name + elif args is Ellipsis: args_str = '...' else: formatted_args = (format_annotation(a) for a in args) |