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

refactor: format_annotation()

Browse Source
This commit is contained in:
Takeshi KOMIYA 2018-08-15 00:42:25 +09:00
parent e26dc81272
commit 5a0f0bdc61
1 changed files with 13 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
sphinx/util/inspect.py
View File

@ -450,6 +450,19 @@ class Signature(object):
Displaying complex types from ``typing`` relies on its private API. Displaying complex types from ``typing`` relies on its private API.
""" """
if isinstance(annotation, string_types):
return annotation # type: ignore
elif isinstance(annotation, typing.TypeVar): # type: ignore
return annotation.__name__
elif not annotation:
return repr(annotation)
elif annotation is NoneType: # type: ignore
return 'None'
elif getattr(annotation, '__module__', None) == 'builtins':
return annotation.__qualname__
elif annotation is Ellipsis:
return '...'
if sys.version_info >= (3, 7): # py37+ if sys.version_info >= (3, 7): # py37+
return self.format_annotation_new(annotation) return self.format_annotation_new(annotation)
else: else:
@ -459,19 +472,6 @@ class Signature(object):
# type: (Any) -> str # type: (Any) -> str
"""format_annotation() for py37+""" """format_annotation() for py37+"""
module = getattr(annotation, '__module__', None) module = getattr(annotation, '__module__', None)
if isinstance(annotation, string_types):
return annotation # type: ignore
elif isinstance(annotation, typing.TypeVar): # type: ignore
return annotation.__name__
elif not annotation:
return repr(annotation)
elif annotation is NoneType: # type: ignore
return 'None'
elif module == 'builtins':
return annotation.__qualname__
elif annotation is Ellipsis:
return '...'
if module == 'typing': if module == 'typing':
if getattr(annotation, '_name', None): if getattr(annotation, '_name', None):
qualname = annotation._name qualname = annotation._name
@ -505,19 +505,6 @@ class Signature(object):
# type: (Any) -> str # type: (Any) -> str
"""format_annotation() for py36 or below""" """format_annotation() for py36 or below"""
module = getattr(annotation, '__module__', None) module = getattr(annotation, '__module__', None)
if isinstance(annotation, string_types):
return annotation # type: ignore
elif isinstance(annotation, typing.TypeVar): # type: ignore
return annotation.__name__
elif not annotation:
return repr(annotation)
elif annotation is NoneType: # type: ignore
return 'None'
elif module == 'builtins':
return annotation.__qualname__
elif annotation is Ellipsis:
return '...'
if module == 'typing': if module == 'typing':
if getattr(annotation, '_name', None): if getattr(annotation, '_name', None):
qualname = annotation._name qualname = annotation._name