Merge pull request #10674 from uranusjr/mypy-fix-windows

Author: uranusjr

tests/lib/__init__.py

@@ -266,14 +266,14 @@ def __getattr__(self, attr: str) -> Any:
     if sys.platform == "win32":
 
         @property
-        def stdout(self):
+        def stdout(self) -> str:
             return self._impl.stdout.replace("\r\n", "\n")
 
         @property
-        def stderr(self):
+        def stderr(self) -> str:
             return self._impl.stderr.replace("\r\n", "\n")
 
-        def __str__(self):
+        def __str__(self) -> str:
             return str(self._impl).replace("\r\n", "\n")
 
     else:
@@ -618,7 +618,7 @@ def run(
         cwd = cwd or self.cwd
         if sys.platform == "win32":
             # Partial fix for ScriptTest.run using `shell=True` on Windows.
-            args = [str(a).replace("^", "^^").replace("&", "^&") for a in args]
+            args = tuple(str(a).replace("^", "^^").replace("&", "^&") for a in args)
 
         if allow_error:
             kw["expect_error"] = True

tests/lib/compat.py

@@ -1,5 +1,8 @@
+# mypy: no-warn-unused-ignores
+
 import contextlib
-from typing import Iterator
+import signal
+from typing import Iterable, Iterator
 
 
 @contextlib.contextmanager
@@ -18,3 +21,34 @@ def nullcontext() -> Iterator[None]:
     support.
     """
     yield
+
+
+# Applies on Windows.
+if not hasattr(signal, "pthread_sigmask"):
+    # We're not relying on this behavior anywhere currently, it's just best
+    # practice.
+    blocked_signals = nullcontext
+else:
+
+    @contextlib.contextmanager
+    def blocked_signals() -> Iterator[None]:
+        """Block all signals for e.g. starting a worker thread."""
+        # valid_signals() was added in Python 3.8 (and not using it results
+        # in a warning on pthread_sigmask() call)
+        mask: Iterable[int]
+        try:
+            mask = signal.valid_signals()
+        except AttributeError:
+            mask = set(range(1, signal.NSIG))
+
+        old_mask = signal.pthread_sigmask(  # type: ignore[attr-defined]
+            signal.SIG_SETMASK,  # type: ignore[attr-defined]
+            mask,
+        )
+        try:
+            yield
+        finally:
+            signal.pthread_sigmask(  # type: ignore[attr-defined]
+                signal.SIG_SETMASK,  # type: ignore[attr-defined]
+                old_mask,
+            )

tests/lib/server.py

@@ -1,5 +1,4 @@
 import os
-import signal
 import ssl
 import threading
 from base64 import b64encode
@@ -11,10 +10,10 @@
 from werkzeug.serving import BaseWSGIServer, WSGIRequestHandler
 from werkzeug.serving import make_server as _make_server
 
-from .compat import nullcontext
+from .compat import blocked_signals
 
 if TYPE_CHECKING:
-    from wsgi import StartResponse, WSGIApplication, WSGIEnvironment
+    from _typeshed.wsgi import StartResponse, WSGIApplication, WSGIEnvironment
 
 Body = Iterable[bytes]
 
@@ -23,31 +22,6 @@ class MockServer(BaseWSGIServer):
     mock: Mock = Mock()
 
 
-# Applies on Python 2 and Windows.
-if not hasattr(signal, "pthread_sigmask"):
-    # We're not relying on this behavior anywhere currently, it's just best
-    # practice.
-    blocked_signals = nullcontext
-else:
-
-    @contextmanager
-    def blocked_signals() -> Iterator[None]:
-        """Block all signals for e.g. starting a worker thread."""
-        # valid_signals() was added in Python 3.8 (and not using it results
-        # in a warning on pthread_sigmask() call)
-        mask: Iterable[int]
-        try:
-            mask = signal.valid_signals()
-        except AttributeError:
-            mask = set(range(1, signal.NSIG))
-
-        old_mask = signal.pthread_sigmask(signal.SIG_SETMASK, mask)
-        try:
-            yield
-        finally:
-            signal.pthread_sigmask(signal.SIG_SETMASK, old_mask)
-
-
 class _RequestHandler(WSGIRequestHandler):
     def make_environ(self) -> Dict[str, Any]:
         environ = super().make_environ()

tests/unit/test_appdirs.py

@@ -1,3 +1,5 @@
+# mypy: no-warn-unused-ignores
+
 import os
 import sys
 from unittest import mock
@@ -14,7 +16,7 @@ def test_user_cache_dir_win(self, monkeypatch: pytest.MonkeyPatch) -> None:
         _get_win_folder = mock.Mock(return_value="C:\\Users\\test\\AppData\\Local")
 
         monkeypatch.setattr(
-            platformdirs.windows,  # type: ignore[attr-defined]
+            platformdirs.windows,  # type: ignore
             "get_win_folder",
             _get_win_folder,
             raising=False,
@@ -65,7 +67,11 @@ def test_user_cache_dir_unicode(self, monkeypatch: pytest.MonkeyPatch) -> None:
         def my_get_win_folder(csidl_name: str) -> str:
             return "\u00DF\u00E4\u03B1\u20AC"
 
-        monkeypatch.setattr(platformdirs.windows, "get_win_folder", my_get_win_folder)
+        monkeypatch.setattr(
+            platformdirs.windows,  # type: ignore
+            "get_win_folder",
+            my_get_win_folder,
+        )
 
         # Do not use the isinstance expression directly in the
         # assert statement, as the Unicode characters in the result
@@ -85,7 +91,7 @@ def test_site_config_dirs_win(self, monkeypatch: pytest.MonkeyPatch) -> None:
         _get_win_folder = mock.Mock(return_value="C:\\ProgramData")
 
         monkeypatch.setattr(
-            platformdirs.windows,  # type: ignore[attr-defined]
+            platformdirs.windows,  # type: ignore
             "get_win_folder",
             _get_win_folder,
             raising=False,
@@ -145,7 +151,7 @@ def test_user_config_dir_win_no_roaming(
         _get_win_folder = mock.Mock(return_value="C:\\Users\\test\\AppData\\Local")
 
         monkeypatch.setattr(
-            platformdirs.windows,  # type: ignore[attr-defined]
+            platformdirs.windows,  # type: ignore
             "get_win_folder",
             _get_win_folder,
             raising=False,
@@ -164,7 +170,7 @@ def test_user_config_dir_win_yes_roaming(
         _get_win_folder = mock.Mock(return_value="C:\\Users\\test\\AppData\\Roaming")
 
         monkeypatch.setattr(
-            platformdirs.windows,  # type: ignore[attr-defined]
+            platformdirs.windows,  # type: ignore
             "get_win_folder",
             _get_win_folder,
             raising=False,

tests/unit/test_locations.py

@@ -51,10 +51,9 @@ def patch(self) -> None:
         # now patch
         tempfile.gettempdir = lambda: self.tempdir
         getpass.getuser = lambda: self.username
-        os.geteuid = lambda: self.st_uid
         os.fstat = lambda fd: self.get_mock_fstat(fd)
-
         if sys.platform != "win32":
+            os.geteuid = lambda: self.st_uid
             pwd.getpwuid = self.get_mock_getpwuid
 
     def revert_patch(self) -> None: