Jan 4, 2024 · Jan 4, 2024 · Jan 4, 2024
diff --git a/Lib/asyncio/streams.py b/Lib/asyncio/streams.py
                                            self._stream_writer)
            if coroutines.iscoroutine(res):
                def callback(task):
                    if task.cancelled():
                        transport.close()
                        return
                    exc = task.exception()
                    if exc is not None:
                        self._loop.call_exception_handler({
diff --git a/Lib/test/test_asyncio/test_streams.py b/Lib/test/test_asyncio/test_streams.py

        self.assertEqual(messages, [])

    deftest_unhandled_exceptions(self) -> None:
    def_basetest_unhandled_exceptions(self, handle_echo):
        port = socket_helper.find_unused_port()

        messages = []
            await wr.wait_closed()

        async def main():
            async def handle_echo(reader, writer):
                raise Exception('test')

            server = await asyncio.start_server(
                handle_echo, 'localhost', port)
            await server.start_serving()
            await server.wait_closed()

        self.loop.run_until_complete(main())
        return messages

    def test_unhandled_exception(self):
        async def handle_echo(reader, writer):
            raise Exception('test')
        messages = self._basetest_unhandled_exceptions(handle_echo)
        self.assertEqual(messages[0]['message'],
                         'Unhandled exception in client_connected_cb')
        # Break explicitly reference cycle
        messages = None
                    'Unhandled exception in client_connected_cb')

    def test_unhandled_cancel(self):
        async def handle_echo(reader, writer):
            asyncio.current_task().cancel()
        messages = self._basetest_unhandled_exceptions(handle_echo)
        self.assertEqual(messages, [])


 if __name__ == '__main__':
diff --git a/Misc/NEWS.d/next/Library/2024-01-03-14-19-26.gh-issue-113538.ahuBCo.rst b/Misc/NEWS.d/next/Library/2024-01-03-14-19-26.gh-issue-113538.ahuBCo.rst
 In :meth:`asyncio.StreamReaderProtocol.connection_made`, there is callback
 that logs an error if the task wrapping the "connected callback" fails. This
 callback would itself fail if the task was cancelled. Prevent this by
 checking whether the task was cancelled first. If so, close the transport
 but don't log an error.
Original file line number	Diff line number	Diff line change
Expand Up		@@ -246,6 +246,9 @@ def connection_made(self, transport):
		self._stream_writer)
		if coroutines.iscoroutine(res):
		def callback(task):
		if task.cancelled():
		transport.close()
		return
		exc = task.exception()
		if exc is not None:
		self._loop.call_exception_handler({
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1123,7 +1123,7 @@ async def inner(httpd):

		self.assertEqual(messages, [])

		deftest_unhandled_exceptions(self) -> None:
		def_basetest_unhandled_exceptions(self, handle_echo):
		port = socket_helper.find_unused_port()

		messages = []
Expand All		@@ -1137,9 +1137,6 @@ async def client():
		await wr.wait_closed()

		async def main():
		async def handle_echo(reader, writer):
		raise Exception('test')

		server = await asyncio.start_server(
		handle_echo, 'localhost', port)
		await server.start_serving()
Expand All		@@ -1148,11 +1145,20 @@ async def handle_echo(reader, writer):
		await server.wait_closed()

		self.loop.run_until_complete(main())
		return messages

		def test_unhandled_exception(self):
		async def handle_echo(reader, writer):
		raise Exception('test')
		messages = self._basetest_unhandled_exceptions(handle_echo)
		self.assertEqual(messages[0]['message'],
		'Unhandled exception in client_connected_cb')
		# Break explicitly reference cycle
		messages = None
		'Unhandled exception in client_connected_cb')

		def test_unhandled_cancel(self):
		async def handle_echo(reader, writer):
		asyncio.current_task().cancel()
		messages = self._basetest_unhandled_exceptions(handle_echo)
		self.assertEqual(messages, [])


		if __name__ == '__main__':
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,5 @@
		In :meth:`asyncio.StreamReaderProtocol.connection_made`, there is callback
		that logs an error if the task wrapping the "connected callback" fails. This
		callback would itself fail if the task was cancelled. Prevent this by
		checking whether the task was cancelled first. If so, close the transport
		but don't log an error.