Skip to content

gh-140947: fix contextvars handling for server tasks in asyncio #141158

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kumaraditya303 merged 17 commits into from
Mar 21, 2026
Merged

gh-140947: fix contextvars handling for server tasks in asyncio #141158

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
a7bf339
properly propagate contextvars for server protocols
kumaraditya303 Nov 3, 2025
40a8f7c
fix _add_writer
kumaraditya303 Dec 2, 2025
d786ca0
Merge branch 'main' of https://github.com/python/cpython into asyncio…
kumaraditya303 Dec 12, 2025
6990bb9
Merge branch 'main' of https://github.com/python/cpython into asyncio…
kumaraditya303 Jan 13, 2026
f845484
refactor 1
kumaraditya303 Jan 13, 2026
f556a84
all tests pass on mac
kumaraditya303 Jan 13, 2026
cbbf0c6
temp fix windows
kumaraditya303 Jan 13, 2026
ac7e954
Merge branch 'asyncio-contextvars-fix' of https://github.com/kumaradi…
kumaraditya303 Mar 21, 2026
b344e60
add tests
kumaraditya303 Mar 21, 2026
6a8e2bd
fix tests
kumaraditya303 Mar 21, 2026
ec0ed9b
add more windows tests
kumaraditya303 Mar 21, 2026
09df55e
fix ssl part
kumaraditya303 Mar 21, 2026
edcedbb
fix tests
kumaraditya303 Mar 21, 2026
e1ebe67
fix windows tests
kumaraditya303 Mar 21, 2026
c42e01c
Merge branch 'asyncio-contextvars-fix' of https://github.com/kumaradi…
kumaraditya303 Mar 21, 2026
a2039d6
📜🤖 Added by blurb_it.
blurb-it[bot] Mar 21, 2026
69874d5
fix tests on machine without ssl
kumaraditya303 Mar 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
all tests pass on mac
  • Loading branch information
@kumaraditya303
kumaraditya303 committed Jan 13, 2026
commit f556a848abb8b97c3db54bee70748eaf0638e8bb
1 change: 0 additions & 1 deletion Lib/asyncio/selector_events.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -936,7 +936,6 @@ class _SelectorSocketTransport(_SelectorTransport):

def __init__(self, loop, sock, protocol, waiter=None,
extra=None, server=None, context=None):
assert context is not None
self._read_ready_cb = None
super().__init__(loop, sock, protocol, extra, server, context)
self._eof = False
Expand Down
2 changes: 1 addition & 1 deletion Lib/test/test_asyncio/test_base_events.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2104,7 +2104,7 @@ def test_accept_connection_exception(self, m_log):
constants.ACCEPT_RETRY_DELAY,
# self.loop._start_serving
mock.ANY,
MyProto, sock, None, None, mock.ANY, mock.ANY, mock.ANY)
MyProto, sock, None, None, mock.ANY, mock.ANY, mock.ANY, mock.ANY)

def test_call_coroutine(self):
async def simple_coroutine():
Expand Down
8 changes: 4 additions & 4 deletions Lib/test/test_asyncio/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,8 +388,8 @@ def close(self):
else: # pragma: no cover
raise AssertionError("Time generator is not finished")

def _add_reader(self, fd, callback, *args):
self.readers[fd] = events.Handle(callback, args, self, None)
def _add_reader(self, fd, callback, *args, context=None):
self.readers[fd] = events.Handle(callback, args, self, context)

def _remove_reader(self, fd):
self.remove_reader_count[fd] += 1
Expand All @@ -414,8 +414,8 @@ def assert_no_reader(self, fd):
if fd in self.readers:
raise AssertionError(f'fd {fd} is registered')

def _add_writer(self, fd, callback, *args):
self.writers[fd] = events.Handle(callback, args, self, None)
def _add_writer(self, fd, callback, *args, context=None):
self.writers[fd] = events.Handle(callback, args, self, context)

def _remove_writer(self, fd):
self.remove_writer_count[fd] += 1
Expand Down
Loading