Merge branch '3.x'

1 files changed, 3 insertions, 3 deletions

diff --git a/sphinx/util/typing.py b/sphinx/util/typing.py
index 8ad8bf75d..6f12a453a 100644
--- a/sphinx/util/typing.py
+++ b/sphinx/util/typing.py
@@ -53,7 +53,7 @@ def stringify(annotation: Any) -> str:
         return annotation.__name__
     elif not annotation:
         return repr(annotation)
-    elif annotation is NoneType:  # type: ignore
+    elif annotation is NoneType:
         return 'None'
     elif (getattr(annotation, '__module__', None) == 'builtins' and
           hasattr(annotation, '__qualname__')):
@@ -91,7 +91,7 @@ def _stringify_py37(annotation: Any) -> str:
 
     if getattr(annotation, '__args__', None):
         if qualname == 'Union':
-            if len(annotation.__args__) > 1 and annotation.__args__[-1] is NoneType:  # type: ignore  # NOQA
+            if len(annotation.__args__) > 1 and annotation.__args__[-1] is NoneType:
                 if len(annotation.__args__) > 2:
                     args = ', '.join(stringify(a) for a in annotation.__args__[:-1])
                     return 'Optional[Union[%s]]' % args
@@ -159,7 +159,7 @@ def _stringify_py36(annotation: Any) -> str:
           annotation.__origin__ is typing.Union):
         params = annotation.__args__
         if params is not None:
-            if len(params) > 1 and params[-1] is NoneType:  # type: ignore
+            if len(params) > 1 and params[-1] is NoneType:
                 if len(params) > 2:
                     param_str = ", ".join(stringify(p) for p in params[:-1])
                     return 'Optional[Union[%s]]' % param_str