IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'stable'

Browse Source
This commit is contained in:
Takeshi KOMIYA 2016-09-29 14:15:33 +09:00
commit 0417a084db
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sphinx/ext/autodoc.py
View File

@ -268,6 +268,8 @@ def format_annotation(annotation):
Displaying complex types from ``typing`` relies on its private API. Displaying complex types from ``typing`` relies on its private API.
""" """
if typing and isinstance(annotation, typing.TypeVar):
return annotation.__name__
if not isinstance(annotation, type): if not isinstance(annotation, type):
return repr(annotation) return repr(annotation)
@ -277,9 +279,7 @@ def format_annotation(annotation):
if annotation.__module__ == 'builtins': if annotation.__module__ == 'builtins':
return annotation.__qualname__ return annotation.__qualname__
elif typing: elif typing:
if isinstance(annotation, typing.TypeVar): if hasattr(typing, 'GenericMeta') and \
return annotation.__name__
elif hasattr(typing, 'GenericMeta') and \
isinstance(annotation, typing.GenericMeta): isinstance(annotation, typing.GenericMeta):
# In Python 3.5.2+, all arguments are stored in __args__, # In Python 3.5.2+, all arguments are stored in __args__,
# whereas __parameters__ only contains generic parameters. # whereas __parameters__ only contains generic parameters.