Merge pull request #9328 from tk0miya/4.x

Merge 4.0.x to 4.x
sphinx-doc · Jun 13, 2021 · 7da62f6 · 7da62f6
2 parents 41fae52 + 244dedb
commit 7da62f6
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/setup.py b/setup.py
@@ -44,8 +44,11 @@
     'lint': [
         'flake8>=3.5.0',
         'isort',
-        'mypy>=0.800',
+        'mypy>=0.900',
         'docutils-stubs',
+        "types-typed-ast",
+        "types-pkg_resources",
+        "types-requests",
     ],
     'test': [
         'pytest',

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
@@ -226,13 +226,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: