summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sphinx/ext/autodoc/inspector.py10
-rw-r--r--sphinx/util/inspect.py10
2 files changed, 10 insertions, 10 deletions
diff --git a/sphinx/ext/autodoc/inspector.py b/sphinx/ext/autodoc/inspector.py
index f1faf2043..5d157c797 100644
--- a/sphinx/ext/autodoc/inspector.py
+++ b/sphinx/ext/autodoc/inspector.py
@@ -65,7 +65,7 @@ def format_annotation(annotation):
elif (hasattr(typing, 'UnionMeta') and
isinstance(annotation, typing.UnionMeta) and # type: ignore
hasattr(annotation, '__union_params__')):
- params = annotation.__union_params__ # type: ignore
+ params = annotation.__union_params__
if params is not None:
param_str = ', '.join(format_annotation(p) for p in params)
return '%s[%s]' % (qualified_name, param_str)
@@ -74,7 +74,7 @@ def format_annotation(annotation):
getattr(annotation, '__args__', None) is not None and
hasattr(annotation, '__result__')):
# Skipped in the case of plain typing.Callable
- args = annotation.__args__ # type: ignore
+ args = annotation.__args__
if args is None:
return qualified_name
elif args is Ellipsis:
@@ -84,15 +84,15 @@ def format_annotation(annotation):
args_str = '[%s]' % ', '.join(formatted_args)
return '%s[%s, %s]' % (qualified_name,
args_str,
- format_annotation(annotation.__result__)) # type: ignore
+ format_annotation(annotation.__result__))
elif (hasattr(typing, 'TupleMeta') and
isinstance(annotation, typing.TupleMeta) and # type: ignore
hasattr(annotation, '__tuple_params__') and
hasattr(annotation, '__tuple_use_ellipsis__')):
- params = annotation.__tuple_params__ # type: ignore
+ params = annotation.__tuple_params__
if params is not None:
param_strings = [format_annotation(p) for p in params]
- if annotation.__tuple_use_ellipsis__: # type: ignore
+ if annotation.__tuple_use_ellipsis__:
param_strings.append('...')
return '%s[%s]' % (qualified_name,
', '.join(param_strings))
diff --git a/sphinx/util/inspect.py b/sphinx/util/inspect.py
index 2d15c2883..da13b8af0 100644
--- a/sphinx/util/inspect.py
+++ b/sphinx/util/inspect.py
@@ -434,7 +434,7 @@ class Signature(object):
elif (hasattr(typing, 'UnionMeta') and # for py35 or below
isinstance(annotation, typing.UnionMeta) and # type: ignore
hasattr(annotation, '__union_params__')):
- params = annotation.__union_params__ # type: ignore
+ params = annotation.__union_params__
if params is not None:
param_str = ', '.join(self.format_annotation(p) for p in params)
return '%s[%s]' % (qualified_name, param_str)
@@ -442,7 +442,7 @@ class Signature(object):
getattr(annotation, '__args__', None) is not None and
hasattr(annotation, '__result__')):
# Skipped in the case of plain typing.Callable
- args = annotation.__args__ # type: ignore
+ args = annotation.__args__
if args is None:
return qualified_name
elif args is Ellipsis:
@@ -452,14 +452,14 @@ class Signature(object):
args_str = '[%s]' % ', '.join(formatted_args)
return '%s[%s, %s]' % (qualified_name,
args_str,
- self.format_annotation(annotation.__result__)) # type: ignore # NOQA
+ self.format_annotation(annotation.__result__))
elif (isinstance(annotation, typing.TupleMeta) and # type: ignore
hasattr(annotation, '__tuple_params__') and
hasattr(annotation, '__tuple_use_ellipsis__')):
- params = annotation.__tuple_params__ # type: ignore
+ params = annotation.__tuple_params__
if params is not None:
param_strings = [self.format_annotation(p) for p in params]
- if annotation.__tuple_use_ellipsis__: # type: ignore
+ if annotation.__tuple_use_ellipsis__:
param_strings.append('...')
return '%s[%s]' % (qualified_name,
', '.join(param_strings))