Merge branch 'master' into named_threads

Author: pquentin

test-requirements.txt

@@ -77,7 +77,7 @@ pexpect==4.8.0
     # via ipython
 pickleshare==0.7.5
     # via ipython
-platformdirs==2.5.3
+platformdirs==2.5.4
     # via
     #   black
     #   pylint

trio/_core/_ki.py

@@ -1,13 +1,16 @@
+from __future__ import annotations
+
 import inspect
 import signal
 import sys
 from functools import wraps
+from typing import TYPE_CHECKING
 
 import attr
 
 from .._util import is_main_thread
 
-if False:
+if TYPE_CHECKING:
     from typing import Any, TypeVar, Callable
 
     F = TypeVar("F", bound=Callable[..., Any])
@@ -54,7 +57,7 @@
 #
 #   If this raises a KeyboardInterrupt, it might be because the coroutine got
 #   interrupted and has unwound... or it might be the KeyboardInterrupt
-#   arrived just *after* 'send' returned, so the coroutine is still running
+#   arrived just *after* 'send' returned, so the coroutine is still running,
 #   but we just lost the message it sent. (And worse, in our actual task
 #   runner, the send is hidden inside a utility function etc.)
 #
@@ -170,10 +173,10 @@ def wrapper(*args, **kwargs):
     return decorator
 
 
-enable_ki_protection = _ki_protection_decorator(True)  # type: Callable[[F], F]
+enable_ki_protection: Callable[[F], F] = _ki_protection_decorator(True)
 enable_ki_protection.__name__ = "enable_ki_protection"
 
-disable_ki_protection = _ki_protection_decorator(False)  # type: Callable[[F], F]
+disable_ki_protection: Callable[[F], F] = _ki_protection_decorator(False)
 disable_ki_protection.__name__ = "disable_ki_protection"
 
 

trio/_subprocess.py

@@ -121,11 +121,11 @@ class Process(AsyncResource, metaclass=NoPublicConstructor):
 
     def __init__(self, popen, stdin, stdout, stderr):
         self._proc = popen
-        self.stdin = stdin  # type: Optional[SendStream]
-        self.stdout = stdout  # type: Optional[ReceiveStream]
-        self.stderr = stderr  # type: Optional[ReceiveStream]
+        self.stdin: Optional[SendStream] = stdin
+        self.stdout: Optional[ReceiveStream] = stdout
+        self.stderr: Optional[ReceiveStream] = stderr
 
-        self.stdio = None  # type: Optional[StapledStream]
+        self.stdio: Optional[StapledStream] = None
         if self.stdin is not None and self.stdout is not None:
             self.stdio = StapledStream(self.stdin, self.stdout)
 
@@ -368,9 +368,9 @@ async def open_process(
                 "on UNIX systems"
             )
 
-    trio_stdin = None  # type: Optional[ClosableSendStream]
-    trio_stdout = None  # type: Optional[ClosableReceiveStream]
-    trio_stderr = None  # type: Optional[ClosableReceiveStream]
+    trio_stdin: Optional[ClosableSendStream] = None
+    trio_stdout: Optional[ClosableReceiveStream] = None
+    trio_stderr: Optional[ClosableReceiveStream] = None
     # Close the parent's handle for each child side of a pipe; we want the child to
     # have the only copy, so that when it exits we can read EOF on our side. The
     # trio ends of pipes will be transferred to the Process object, which will be

trio/_util.py

@@ -1,13 +1,9 @@
-# coding: utf-8
-
 # Little utilities we use internally
 
 from abc import ABCMeta
 import os
 import signal
-import sys
-import pathlib
-from functools import wraps, update_wrapper
+from functools import update_wrapper
 import typing as t
 import threading
 import collections
@@ -17,7 +13,7 @@
 
 # Equivalent to the C function raise(), which Python doesn't wrap
 if os.name == "nt":
-    # On windows, os.kill exists but is really weird.
+    # On Windows, os.kill exists but is really weird.
     #
     # If you give it CTRL_C_EVENT or CTRL_BREAK_EVENT, it tries to deliver
     # those using GenerateConsoleCtrlEvent. But I found that when I tried
@@ -36,7 +32,7 @@
     # OTOH, if you pass os.kill any *other* signal number... then CPython
     # just calls TerminateProcess (wtf).
     #
-    # So, anyway, os.kill is not so useful for testing purposes. Instead
+    # So, anyway, os.kill is not so useful for testing purposes. Instead,
     # we use raise():
     #
     #   https://msdn.microsoft.com/en-us/library/dwwzkt4c.aspx
@@ -226,7 +222,7 @@ def fix_one(qualname, name, obj):
         mod = getattr(obj, "__module__", None)
         if mod is not None and mod.startswith("trio."):
             obj.__module__ = module_name
-            # Modules, unlike everything else in Python, put fully-qualitied
+            # Modules, unlike everything else in Python, put fully-qualified
             # names into their __name__ attribute. We check for "." to avoid
             # rewriting these.
             if hasattr(obj, "__name__") and "." not in obj.__name__:
@@ -277,11 +273,11 @@ class Final(ABCMeta):
         class SomeClass(metaclass=Final):
             pass
 
-    The metaclass will ensure that no sub class can be created.
+    The metaclass will ensure that no subclass can be created.
 
     Raises
     ------
-    - TypeError if a sub class is created
+    - TypeError if a subclass is created
     """
 
     def __new__(cls, name, bases, cls_namespace):
@@ -305,14 +301,14 @@ class NoPublicConstructor(Final):
         class SomeClass(metaclass=NoPublicConstructor):
             pass
 
-    The metaclass will ensure that no sub class can be created, and that no instance
+    The metaclass will ensure that no subclass can be created, and that no instance
     can be initialized.
 
     If you try to instantiate your class (SomeClass()), a TypeError will be thrown.
 
     Raises
     ------
-    - TypeError if a sub class or an instance is created.
+    - TypeError if a subclass or an instance is created.
     """
 
     def __call__(cls, *args, **kwargs):
@@ -333,7 +329,7 @@ def name_asyncgen(agen):
     try:
         module = agen.ag_frame.f_globals["__name__"]
     except (AttributeError, KeyError):
-        module = "<{}>".format(agen.ag_code.co_filename)
+        module = f"<{agen.ag_code.co_filename}>"
     try:
         qualname = agen.__qualname__
     except AttributeError:

trio/testing/_sequencer.py

@@ -1,14 +1,17 @@
+from __future__ import annotations
+
 from collections import defaultdict
 from contextlib import asynccontextmanager
+from typing import TYPE_CHECKING
 
 import attr
 
 from .. import _core
 from .. import _util
 from .. import Event
 
-if False:
-    from typing import DefaultDict, Set
+if TYPE_CHECKING:
+    from collections.abc import AsyncIterator
 
 
 @attr.s(eq=False, hash=False)
@@ -52,14 +55,14 @@ async def main():
 
     """
 
-    _sequence_points = attr.ib(
+    _sequence_points: defaultdict[int, Event] = attr.ib(
         factory=lambda: defaultdict(Event), init=False
-    )  # type: DefaultDict[int, Event]
-    _claimed = attr.ib(factory=set, init=False)  # type: Set[int]
-    _broken = attr.ib(default=False, init=False)
+    )
+    _claimed: set[int] = attr.ib(factory=set, init=False)
+    _broken: bool = attr.ib(default=False, init=False)
 
     @asynccontextmanager
-    async def __call__(self, position: int):
+    async def __call__(self, position: int) -> AsyncIterator[None]:
         if position in self._claimed:
             raise RuntimeError("Attempted to re-use sequence point {}".format(position))
         if self._broken:

trio/tests/test_windows_pipes.py

@@ -3,6 +3,9 @@
 
 import os
 import sys
+from typing import Any
+from typing import Tuple
+
 import pytest
 
 from .._core.tests.tutil import gc_collect_harder
@@ -15,12 +18,12 @@
     from asyncio.windows_utils import pipe
 else:
     pytestmark = pytest.mark.skip(reason="windows only")
-    pipe = None  # type: Any
-    PipeSendStream = None  # type: Any
-    PipeReceiveStream = None  # type: Any
+    pipe: Any = None
+    PipeSendStream: Any = None
+    PipeReceiveStream: Any = None
 
 
-async def make_pipe() -> "Tuple[PipeSendStream, PipeReceiveStream]":
+async def make_pipe() -> Tuple[PipeSendStream, PipeReceiveStream]:
     """Makes a new pair of pipes."""
     (r, w) = pipe()
     return PipeSendStream(w), PipeReceiveStream(r)