goodboy
/
tractor
1
0
Fork 2
Code Issues 5 Pull Requests 8 Packages Projects Releases Wiki Activity

Continue supporting py3.11+ 

Apparently the only thing needing a guard was use of
`asyncio.Queue.shutdown()` and the paired `QueueShutDown` exception?

Cool.
ext_type_plds_XPS_BACKUP
Tyler Goodlet 2025-03-19 13:30:05 -04:00
parent 1a668faeaa
commit 7a642edf7a
1 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
tractor/to_asyncio.py
View File

@ -23,12 +23,10 @@ import asyncio
from asyncio.exceptions import ( from asyncio.exceptions import (
CancelledError, CancelledError,
) )
from asyncio import (
QueueShutDown,
)
from contextlib import asynccontextmanager as acm from contextlib import asynccontextmanager as acm
from dataclasses import dataclass from dataclasses import dataclass
import inspect import inspect
import platform
import traceback import traceback
from typing import ( from typing import (
Any, Any,
@ -79,6 +77,20 @@ __all__ = [
'run_as_asyncio_guest', 'run_as_asyncio_guest',
] ]
if (_py_313 := (
('3', '13')
==
platform.python_version_tuple()[:-1]
)
):
# 3.13+ only.. lel.
# https://docs.python.org/3.13/library/asyncio-queue.html#asyncio.QueueShutDown
from asyncio import (
QueueShutDown,
)
else:
QueueShutDown = False
# TODO, generally speaking we can generalize this abstraction, a "SC linked # TODO, generally speaking we can generalize this abstraction, a "SC linked
# parent->child task pair", as the same "supervision scope primitive" # parent->child task pair", as the same "supervision scope primitive"
@ -575,7 +587,11 @@ def _run_asyncio_task(
# normally suppressed unless the trio.Task also errors # normally suppressed unless the trio.Task also errors
# #
# ?TODO, is this even needed (does it happen) now? # ?TODO, is this even needed (does it happen) now?
elif isinstance(aio_err, QueueShutDown): elif (
_py_313
and
isinstance(aio_err, QueueShutDown)
):
# import pdbp; pdbp.set_trace() # import pdbp; pdbp.set_trace()
trio_err = AsyncioTaskExited( trio_err = AsyncioTaskExited(
'Task exited before `trio` side' 'Task exited before `trio` side'
@ -955,9 +971,10 @@ async def translate_aio_errors(
# or an error, we ensure the aio-side gets signalled via # or an error, we ensure the aio-side gets signalled via
# an explicit exception and its `Queue` is shutdown. # an explicit exception and its `Queue` is shutdown.
if ya_trio_exited: if ya_trio_exited:
# raise `QueueShutDown` on next `Queue.get()` call on # XXX py3.13+ ONLY..
# aio side. # raise `QueueShutDown` on next `Queue.get/put()`
chan._to_aio.shutdown() if _py_313:
chan._to_aio.shutdown()
# pump this event-loop (well `Runner` but ya) # pump this event-loop (well `Runner` but ya)
# #