Merge branch '4.x' into 5.x

tk0miya · Apr 30, 2022 · 3de45b3 · 3de45b3
2 parents 5eeeb9c + f475bf1
commit 3de45b3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/setup.py b/setup.py
@@ -41,7 +41,7 @@
     'lint': [
         'flake8>=3.5.0',
         'isort',
-        'mypy>=0.931',
+        'mypy>=0.950',
         'docutils-stubs',
         "types-typed-ast",
         "types-requests",

diff --git a/sphinx/domains/python.py b/sphinx/domains/python.py
@@ -1426,7 +1426,7 @@ def istyping(s: str) -> bool:
         if s.startswith('typing.'):
             s = s.split('.', 1)[1]
 
-        return s in typing.__all__  # type: ignore
+        return s in typing.__all__
 
     if node.get('refdomain') != 'py':
         return None

diff --git a/sphinx/locale/__init__.py b/sphinx/locale/__init__.py
@@ -59,19 +59,19 @@ def __str__(self) -> str:
     def __add__(self, other: str) -> str:  # type: ignore
         return self.data + other
 
-    def __radd__(self, other: str) -> str:
+    def __radd__(self, other: str) -> str:  # type: ignore
         return other + self.data
 
     def __mod__(self, other: str) -> str:  # type: ignore
         return self.data % other
 
-    def __rmod__(self, other: str) -> str:
+    def __rmod__(self, other: str) -> str:  # type: ignore
         return other % self.data
 
     def __mul__(self, other: Any) -> str:  # type: ignore
         return self.data * other
 
-    def __rmul__(self, other: Any) -> str:
+    def __rmul__(self, other: Any) -> str:  # type: ignore
         return other * self.data
 
     def __getattr__(self, name: str) -> Any: