Fixes for 3.13 (#3005)

* Try out naive KI protection fix * Update generated files * Account for `._local` in full name * Add 3.13 to CI matrix * Avoid cryptography * Avoid an evil operation, I guess * un-inline ki protection decorator new f_locals method doesn't create a cycle in this situation * Advertise 3.12 + maybe cryptography works? * Switch back to avoiding cryptography * Try cryptography one more time * Add symbols * Try one other possibility for symbols * More symbol trial and error * Try to pick up patterns in what allows what * Test hypothesis * Finish off failures * Remove trailing whitespace --------- Co-authored-by: richardsheridan <[email protected]>
python-trio · Jun 13, 2024 · 0f5fc6c · 0f5fc6c
1 parent 4dcdc6d
commit 0f5fc6c
Show file tree

Hide file tree

Showing 15 changed files with 61 additions and 45 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -87,7 +87,7 @@ jobs:
  strategy:
  fail-fast: false
  matrix:
- python: ['pypy-3.9', 'pypy-3.10', '3.8', '3.9', '3.10', '3.11', '3.12']
+ python: ['pypy-3.9', 'pypy-3.10', '3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
  check_formatting: ['0']
  no_test_requirements: ['0']
  extra_name: ['']

diff --git a/pyproject.toml b/pyproject.toml
@@ -31,6 +31,7 @@ classifiers = [
  "Programming Language :: Python :: 3.10",
  "Programming Language :: Python :: 3.11",
  "Programming Language :: Python :: 3.12",
+ "Programming Language :: Python :: 3.13",
  "Topic :: System :: Networking",
  "Typing :: Typed",
 ]

diff --git a/src/trio/_core/_generated_instrumentation.py b/src/trio/_core/_generated_instrumentation.py
@@ -3,6 +3,7 @@
 # *************************************************************
 from __future__ import annotations
 
+import sys
 from typing import TYPE_CHECKING
 
 from ._ki import LOCALS_KEY_KI_PROTECTION_ENABLED
@@ -23,7 +24,7 @@ def add_instrument(instrument: Instrument) -> None:
  If ``instrument`` is already active, does nothing.
 
  """
- locals()[LOCALS_KEY_KI_PROTECTION_ENABLED] = True
+ sys._getframe().f_locals[LOCALS_KEY_KI_PROTECTION_ENABLED] = True
  try:
  return GLOBAL_RUN_CONTEXT.runner.instruments.add_instrument(instrument)
  except AttributeError:
@@ -43,7 +44,7 @@ def remove_instrument(instrument: Instrument) -> None:
  deactivated.
 
  """
- locals()[LOCALS_KEY_KI_PROTECTION_ENABLED] = True
+ sys._getframe().f_locals[LOCALS_KEY_KI_PROTECTION_ENABLED] = True
  try:
  return GLOBAL_RUN_CONTEXT.runner.instruments.remove_instrument(instrument)
  except AttributeError:

diff --git a/src/trio/_core/_generated_io_epoll.py b/src/trio/_core/_generated_io_epoll.py
@@ -3,14 +3,14 @@
 # *************************************************************
 from __future__ import annotations
 
+import sys
 from typing import TYPE_CHECKING
 
 from ._ki import LOCALS_KEY_KI_PROTECTION_ENABLED
 from ._run import GLOBAL_RUN_CONTEXT
 
 if TYPE_CHECKING:
  from .._file_io import _HasFileNo
-import sys
 
 assert not TYPE_CHECKING or sys.platform == "linux"
 
@@ -40,7 +40,7 @@ async def wait_readable(fd: int | _HasFileNo) -> None:
  if another task calls :func:`notify_closing` while this
  function is still working.
  """
- locals()[LOCALS_KEY_KI_PROTECTION_ENABLED] = True
+ sys._getframe().f_locals[LOCALS_KEY_KI_PROTECTION_ENABLED] = True
  try:
  return await GLOBAL_RUN_CONTEXT.runner.io_manager.wait_readable(fd)
  except AttributeError:
@@ -59,7 +59,7 @@ async def wait_writable(fd: int | _HasFileNo) -> None:
  if another task calls :func:`notify_closing` while this
  function is still working.
  """
- locals()[LOCALS_KEY_KI_PROTECTION_ENABLED] = True
+ sys._getframe().f_locals[LOCALS_KEY_KI_PROTECTION_ENABLED] = True
  try:
  return await GLOBAL_RUN_CONTEXT.runner.io_manager.wait_writable(fd)
  except AttributeError:
@@ -91,7 +91,7 @@ def notify_closing(fd: int | _HasFileNo) -> None:
  step, so other tasks won't be able to tell what order they happened
  in anyway.
  """
- locals()[LOCALS_KEY_KI_PROTECTION_ENABLED] = True
+ sys._getframe().f_locals[LOCALS_KEY_KI_PROTECTION_ENABLED] = True
  try:
  return GLOBAL_RUN_CONTEXT.runner.io_manager.notify_closing(fd)
  except AttributeError:

diff --git a/src/trio/_core/_generated_io_kqueue.py b/src/trio/_core/_generated_io_kqueue.py
@@ -3,6 +3,7 @@
 # *************************************************************
 from __future__ import annotations
 
+import sys
 from typing import TYPE_CHECKING, Callable, ContextManager
 
 from ._ki import LOCALS_KEY_KI_PROTECTION_ENABLED
@@ -14,7 +15,6 @@
  from .. import _core
  from .._file_io import _HasFileNo
  from ._traps import Abort, RaiseCancelT
-import sys
 
 assert not TYPE_CHECKING or sys.platform == "darwin"
 
@@ -34,7 +34,7 @@ def current_kqueue() -> select.kqueue:
  anything real. See `#26
  <https://github.com/python-trio/trio/issues/26>`__.
  """
- locals()[LOCALS_KEY_KI_PROTECTION_ENABLED] = True
+ sys._getframe().f_locals[LOCALS_KEY_KI_PROTECTION_ENABLED] = True
  try:
  return GLOBAL_RUN_CONTEXT.runner.io_manager.current_kqueue()
  except AttributeError:
@@ -48,7 +48,7 @@ def monitor_kevent(
  anything real. See `#26
  <https://github.com/python-trio/trio/issues/26>`__.
  """
- locals()[LOCALS_KEY_KI_PROTECTION_ENABLED] = True
+ sys._getframe().f_locals[LOCALS_KEY_KI_PROTECTION_ENABLED] = True
  try:
  return GLOBAL_RUN_CONTEXT.runner.io_manager.monitor_kevent(ident, filter)
  except AttributeError:
@@ -62,7 +62,7 @@ async def wait_kevent(
  anything real. See `#26
  <https://github.com/python-trio/trio/issues/26>`__.
  """
- locals()[LOCALS_KEY_KI_PROTECTION_ENABLED] = True
+ sys._getframe().f_locals[LOCALS_KEY_KI_PROTECTION_ENABLED] = True
  try:
  return await GLOBAL_RUN_CONTEXT.runner.io_manager.wait_kevent(
  ident, filter, abort_func
@@ -93,7 +93,7 @@ async def wait_readable(fd: int | _HasFileNo) -> None:
  if another task calls :func:`notify_closing` while this
  function is still working.
  """
- locals()[LOCALS_KEY_KI_PROTECTION_ENABLED] = True
+ sys._getframe().f_locals[LOCALS_KEY_KI_PROTECTION_ENABLED] = True
  try:
  return await GLOBAL_RUN_CONTEXT.runner.io_manager.wait_readable(fd)
  except AttributeError:
@@ -112,7 +112,7 @@ async def wait_writable(fd: int | _HasFileNo) -> None:
  if another task calls :func:`notify_closing` while this
  function is still working.
  """
- locals()[LOCALS_KEY_KI_PROTECTION_ENABLED] = True
+ sys._getframe().f_locals[LOCALS_KEY_KI_PROTECTION_ENABLED] = True
  try:
  return await GLOBAL_RUN_CONTEXT.runner.io_manager.wait_writable(fd)
  except AttributeError:
@@ -144,7 +144,7 @@ def notify_closing(fd: int | _HasFileNo) -> None:
  step, so other tasks won't be able to tell what order they happened
  in anyway.
  """
- locals()[LOCALS_KEY_KI_PROTECTION_ENABLED] = True
+ sys._getframe().f_locals[LOCALS_KEY_KI_PROTECTION_ENABLED] = True
  try:
  return GLOBAL_RUN_CONTEXT.runner.io_manager.notify_closing(fd)
  except AttributeError:

diff --git a/src/trio/_core/_generated_io_windows.py b/src/trio/_core/_generated_io_windows.py
@@ -3,6 +3,7 @@
 # *************************************************************
 from __future__ import annotations
 
+import sys
 from typing import TYPE_CHECKING, ContextManager
 
 from ._ki import LOCALS_KEY_KI_PROTECTION_ENABLED
@@ -14,7 +15,6 @@
  from .._file_io import _HasFileNo
  from ._unbounded_queue import UnboundedQueue
  from ._windows_cffi import CData, Handle
-import sys
 
 assert not TYPE_CHECKING or sys.platform == "win32"
 
@@ -54,7 +54,7 @@ async def wait_readable(sock: _HasFileNo | int) -> None:
  if another task calls :func:`notify_closing` while this
  function is still working.
  """
- locals()[LOCALS_KEY_KI_PROTECTION_ENABLED] = True
+ sys._getframe().f_locals[LOCALS_KEY_KI_PROTECTION_ENABLED] = True
  try:
  return await GLOBAL_RUN_CONTEXT.runner.io_manager.wait_readable(sock)
  except AttributeError:
@@ -73,7 +73,7 @@ async def wait_writable(sock: _HasFileNo | int) -> None:
  if another task calls :func:`notify_closing` while this
  function is still working.
  """
- locals()[LOCALS_KEY_KI_PROTECTION_ENABLED] = True
+ sys._getframe().f_locals[LOCALS_KEY_KI_PROTECTION_ENABLED] = True
  try:
  return await GLOBAL_RUN_CONTEXT.runner.io_manager.wait_writable(sock)
  except AttributeError:
@@ -105,7 +105,7 @@ def notify_closing(handle: Handle | int | _HasFileNo) -> None:
  step, so other tasks won't be able to tell what order they happened
  in anyway.
  """
- locals()[LOCALS_KEY_KI_PROTECTION_ENABLED] = True
+ sys._getframe().f_locals[LOCALS_KEY_KI_PROTECTION_ENABLED] = True
  try:
  return GLOBAL_RUN_CONTEXT.runner.io_manager.notify_closing(handle)
  except AttributeError:
@@ -118,7 +118,7 @@ def register_with_iocp(handle: int | CData) -> None:
  <https://github.com/python-trio/trio/issues/26>`__ and `#52
  <https://github.com/python-trio/trio/issues/52>`__.
  """
- locals()[LOCALS_KEY_KI_PROTECTION_ENABLED] = True
+ sys._getframe().f_locals[LOCALS_KEY_KI_PROTECTION_ENABLED] = True
  try:
  return GLOBAL_RUN_CONTEXT.runner.io_manager.register_with_iocp(handle)
  except AttributeError:
@@ -131,7 +131,7 @@ async def wait_overlapped(handle_: int | CData, lpOverlapped: CData | int) -> ob
  <https://github.com/python-trio/trio/issues/26>`__ and `#52
  <https://github.com/python-trio/trio/issues/52>`__.
  """
- locals()[LOCALS_KEY_KI_PROTECTION_ENABLED] = True
+ sys._getframe().f_locals[LOCALS_KEY_KI_PROTECTION_ENABLED] = True
  try:
  return await GLOBAL_RUN_CONTEXT.runner.io_manager.wait_overlapped(
  handle_, lpOverlapped
@@ -148,7 +148,7 @@ async def write_overlapped(
  <https://github.com/python-trio/trio/issues/26>`__ and `#52
  <https://github.com/python-trio/trio/issues/52>`__.
  """
- locals()[LOCALS_KEY_KI_PROTECTION_ENABLED] = True
+ sys._getframe().f_locals[LOCALS_KEY_KI_PROTECTION_ENABLED] = True
  try:
  return await GLOBAL_RUN_CONTEXT.runner.io_manager.write_overlapped(
  handle, data, file_offset
@@ -165,7 +165,7 @@ async def readinto_overlapped(
  <https://github.com/python-trio/trio/issues/26>`__ and `#52
  <https://github.com/python-trio/trio/issues/52>`__.
  """
- locals()[LOCALS_KEY_KI_PROTECTION_ENABLED] = True
+ sys._getframe().f_locals[LOCALS_KEY_KI_PROTECTION_ENABLED] = True
  try:
  return await GLOBAL_RUN_CONTEXT.runner.io_manager.readinto_overlapped(
  handle, buffer, file_offset
@@ -180,7 +180,7 @@ def current_iocp() -> int:
  <https://github.com/python-trio/trio/issues/26>`__ and `#52
  <https://github.com/python-trio/trio/issues/52>`__.
  """
- locals()[LOCALS_KEY_KI_PROTECTION_ENABLED] = True
+ sys._getframe().f_locals[LOCALS_KEY_KI_PROTECTION_ENABLED] = True
  try:
  return GLOBAL_RUN_CONTEXT.runner.io_manager.current_iocp()
  except AttributeError:
@@ -193,7 +193,7 @@ def monitor_completion_key() -> ContextManager[tuple[int, UnboundedQueue[object]
  <https://github.com/python-trio/trio/issues/26>`__ and `#52
  <https://github.com/python-trio/trio/issues/52>`__.
  """
- locals()[LOCALS_KEY_KI_PROTECTION_ENABLED] = True
+ sys._getframe().f_locals[LOCALS_KEY_KI_PROTECTION_ENABLED] = True
  try:
  return GLOBAL_RUN_CONTEXT.runner.io_manager.monitor_completion_key()
  except AttributeError:

diff --git a/src/trio/_core/_generated_run.py b/src/trio/_core/_generated_run.py
@@ -3,6 +3,7 @@
 # *************************************************************
 from __future__ import annotations
 
+import sys
 from typing import TYPE_CHECKING, Any
 
 from ._ki import LOCALS_KEY_KI_PROTECTION_ENABLED
@@ -55,7 +56,7 @@ def current_statistics() -> RunStatistics:
  other attributes vary between backends.
 
  """
- locals()[LOCALS_KEY_KI_PROTECTION_ENABLED] = True
+ sys._getframe().f_locals[LOCALS_KEY_KI_PROTECTION_ENABLED] = True
  try:
  return GLOBAL_RUN_CONTEXT.runner.current_statistics()
  except AttributeError:
@@ -72,7 +73,7 @@ def current_time() -> float:
  RuntimeError: if not inside a call to :func:`trio.run`.
 
  """
- locals()[LOCALS_KEY_KI_PROTECTION_ENABLED] = True
+ sys._getframe().f_locals[LOCALS_KEY_KI_PROTECTION_ENABLED] = True
  try:
  return GLOBAL_RUN_CONTEXT.runner.current_time()
  except AttributeError:
@@ -81,7 +82,7 @@ def current_time() -> float:
 
 def current_clock() -> Clock:
  """Returns the current :class:`~trio.abc.Clock`."""
- locals()[LOCALS_KEY_KI_PROTECTION_ENABLED] = True
+ sys._getframe().f_locals[LOCALS_KEY_KI_PROTECTION_ENABLED] = True
  try:
  return GLOBAL_RUN_CONTEXT.runner.current_clock()
  except AttributeError:
@@ -94,7 +95,7 @@ def current_root_task() -> Task | None:
  This is the task that is the ultimate parent of all other tasks.
 
  """
- locals()[LOCALS_KEY_KI_PROTECTION_ENABLED] = True
+ sys._getframe().f_locals[LOCALS_KEY_KI_PROTECTION_ENABLED] = True
  try:
  return GLOBAL_RUN_CONTEXT.runner.current_root_task()
  except AttributeError:
@@ -119,7 +120,7 @@ def reschedule(task: Task, next_send: Outcome[Any] = _NO_SEND) -> None:
  raise) from :func:`wait_task_rescheduled`.
 
  """
- locals()[LOCALS_KEY_KI_PROTECTION_ENABLED] = True
+ sys._getframe().f_locals[LOCALS_KEY_KI_PROTECTION_ENABLED] = True
  try:
  return GLOBAL_RUN_CONTEXT.runner.reschedule(task, next_send)
  except AttributeError:
@@ -183,7 +184,7 @@ def spawn_system_task(
  Task: the newly spawned task
 
  """
- locals()[LOCALS_KEY_KI_PROTECTION_ENABLED] = True
+ sys._getframe().f_locals[LOCALS_KEY_KI_PROTECTION_ENABLED] = True
  try:
  return GLOBAL_RUN_CONTEXT.runner.spawn_system_task(
  async_fn, *args, name=name, context=context
@@ -197,7 +198,7 @@ def current_trio_token() -> TrioToken:
  :func:`trio.run`.
 
  """
- locals()[LOCALS_KEY_KI_PROTECTION_ENABLED] = True
+ sys._getframe().f_locals[LOCALS_KEY_KI_PROTECTION_ENABLED] = True
  try:
  return GLOBAL_RUN_CONTEXT.runner.current_trio_token()
  except AttributeError:
@@ -262,7 +263,7 @@ async def test_lock_fairness():
  print("FAIL")
 
  """
- locals()[LOCALS_KEY_KI_PROTECTION_ENABLED] = True
+ sys._getframe().f_locals[LOCALS_KEY_KI_PROTECTION_ENABLED] = True
  try:
  return await GLOBAL_RUN_CONTEXT.runner.wait_all_tasks_blocked(cushion)
  except AttributeError:

diff --git a/src/trio/_core/_ki.py b/src/trio/_core/_ki.py
@@ -178,7 +178,7 @@ def wrapper(*args: ArgsT.args, **kwargs: ArgsT.kwargs) -> RetT: # type: ignore[
 
  @wraps(fn)
  def wrapper(*args: ArgsT.args, **kwargs: ArgsT.kwargs) -> RetT:
- locals()[LOCALS_KEY_KI_PROTECTION_ENABLED] = enabled
+ sys._getframe().f_locals[LOCALS_KEY_KI_PROTECTION_ENABLED] = enabled
  return fn(*args, **kwargs)
 
  return wrapper

diff --git a/src/trio/_core/_run.py b/src/trio/_core/_run.py
@@ -623,6 +623,7 @@ def _close(self, exc: BaseException | None) -> BaseException | None:
  self._cancel_status = None
  return exc
 
+ @enable_ki_protection
  def __exit__(
  self,
  etype: type[BaseException] | None,
@@ -633,10 +634,6 @@ def __exit__(
  # so __exit__() must be just _close() plus this logic for adapting
  # the exception-filtering result to the context manager API.
 
- # This inlines the enable_ki_protection decorator so we can fix
- # f_locals *locally* below to avoid reference cycles
- locals()[LOCALS_KEY_KI_PROTECTION_ENABLED] = True
-
  # Tracebacks show the 'raise' line below out of context, so let's give
  # this variable a name that makes sense out of context.
  remaining_error_after_cancel_scope = self._close(exc)
@@ -658,10 +655,6 @@ def __exit__(
  # see test_cancel_scope_exit_doesnt_create_cyclic_garbage
  # Note: still relevant
  del remaining_error_after_cancel_scope, value, _, exc
- # deep magic to remove refs via f_locals
- locals()
- # TODO: check if PEP558 changes the need for this call
- # https://github.com/python/cpython/pull/3640
 
  def __repr__(self) -> str:
  if self._cancel_status is not None:
@@ -2476,7 +2469,7 @@ def unrolled_run(
  args: tuple[Unpack[PosArgT]],
  host_uses_signal_set_wakeup_fd: bool = False,
 ) -> Generator[float, EventResult, None]:
- locals()[LOCALS_KEY_KI_PROTECTION_ENABLED] = True
+ sys._getframe().f_locals[LOCALS_KEY_KI_PROTECTION_ENABLED] = True
  __tracebackhide__ = True
 
  try:

diff --git a/src/trio/_path.py b/src/trio/_path.py
@@ -242,6 +242,8 @@ def __repr__(self) -> str:
  write_text = _wrap_method(pathlib.Path.write_text)
  if sys.version_info < (3, 12):
  link_to = _wrap_method(pathlib.Path.link_to)
+ if sys.version_info >= (3, 13):
+ full_match = _wrap_method(pathlib.Path.full_match)
 
 
 @final