Merge pull request #9327 from jrfk/feature/mypy_0900_breaking_update_…

…for_stub Fix mypy violations (delete type: ignore ) (with mypy-0.900)
sphinx-doc · Jun 13, 2021 · b7c05a2 · b7c05a2
2 parents 8a59390 + a8771f4
commit b7c05a2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/sphinx/util/logging.py b/sphinx/util/logging.py
@@ -573,21 +573,21 @@ def setup(app: "Sphinx", status: IO, warning: IO) -> None:
     for handler in logger.handlers[:]:
         logger.removeHandler(handler)
 
-    info_handler = NewLineStreamHandler(SafeEncodingWriter(status))  # type: ignore
+    info_handler = NewLineStreamHandler(SafeEncodingWriter(status))
     info_handler.addFilter(InfoFilter())
     info_handler.addFilter(InfoLogRecordTranslator(app))
     info_handler.setLevel(VERBOSITY_MAP[app.verbosity])
     info_handler.setFormatter(ColorizeFormatter())
 
-    warning_handler = WarningStreamHandler(SafeEncodingWriter(warning))  # type: ignore
+    warning_handler = WarningStreamHandler(SafeEncodingWriter(warning))
     warning_handler.addFilter(WarningSuppressor(app))
     warning_handler.addFilter(WarningLogRecordTranslator(app))
     warning_handler.addFilter(WarningIsErrorFilter(app))
     warning_handler.addFilter(OnceFilter())
     warning_handler.setLevel(logging.WARNING)
     warning_handler.setFormatter(ColorizeFormatter())
 
-    messagelog_handler = logging.StreamHandler(LastMessagesWriter(app, status))  # type: ignore
+    messagelog_handler = logging.StreamHandler(LastMessagesWriter(app, status))
     messagelog_handler.addFilter(InfoFilter())
     messagelog_handler.setLevel(VERBOSITY_MAP[app.verbosity])
     messagelog_handler.setFormatter(ColorizeFormatter())

diff --git a/sphinx/util/typing.py b/sphinx/util/typing.py
@@ -223,13 +223,13 @@ def _restify_py36(cls: Optional[Type]) -> str:
         else:
             reftext = ':class:`%s`' % qualname
 
-        if cls.__args__ is None or len(cls.__args__) <= 2:  # type: ignore  # NOQA
-            params = cls.__args__  # type: ignore
-        elif cls.__origin__ == Generator:  # type: ignore
-            params = cls.__args__  # type: ignore
+        if cls.__args__ is None or len(cls.__args__) <= 2:
+            params = cls.__args__
+        elif cls.__origin__ == Generator:
+            params = cls.__args__
         else:  # typing.Callable
-            args = ', '.join(restify(arg) for arg in cls.__args__[:-1])  # type: ignore
-            result = restify(cls.__args__[-1])  # type: ignore
+            args = ', '.join(restify(arg) for arg in cls.__args__[:-1])
+            result = restify(cls.__args__[-1])
             return reftext + '\\ [[%s], %s]' % (args, result)
 
         if params: