[Python-checkins] [3.9] bpo-46469: Make asyncio generic classes return GenericAlias (GH-30777) (GH-30785)
miss-islington
webhook-mailer at python.org
Sat Jan 22 07:52:30 EST 2022
https://github.com/python/cpython/commit/6ed874f8c59cc6c01d9663bad2f4bed8dc1c6109
commit: 6ed874f8c59cc6c01d9663bad2f4bed8dc1c6109
branch: 3.9
author: Kumar Aditya <59607654+kumaraditya303 at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-01-22T04:52:24-08:00
summary:
[3.9] bpo-46469: Make asyncio generic classes return GenericAlias (GH-30777) (GH-30785)
Automerge-Triggered-By: GH:asvetlov
files:
A Misc/NEWS.d/next/Library/2022-01-22-05-05-08.bpo-46469.plUab5.rst
M Lib/asyncio/futures.py
M Lib/asyncio/queues.py
M Lib/asyncio/tasks.py
M Lib/test/test_asyncio/test_futures.py
M Lib/test/test_asyncio/test_queues.py
M Lib/test/test_asyncio/test_tasks.py
M Modules/_asynciomodule.c
diff --git a/Lib/asyncio/futures.py b/Lib/asyncio/futures.py
index bed4da52fd4d9..aaab09c28e6b5 100644
--- a/Lib/asyncio/futures.py
+++ b/Lib/asyncio/futures.py
@@ -8,6 +8,7 @@
import contextvars
import logging
import sys
+from types import GenericAlias
from . import base_futures
from . import events
@@ -106,8 +107,7 @@ def __del__(self):
context['source_traceback'] = self._source_traceback
self._loop.call_exception_handler(context)
- def __class_getitem__(cls, type):
- return cls
+ __class_getitem__ = classmethod(GenericAlias)
@property
def _log_traceback(self):
diff --git a/Lib/asyncio/queues.py b/Lib/asyncio/queues.py
index cd3f7c6a56789..14ae87e0a2dd2 100644
--- a/Lib/asyncio/queues.py
+++ b/Lib/asyncio/queues.py
@@ -3,6 +3,7 @@
import collections
import heapq
import warnings
+from types import GenericAlias
from . import events
from . import locks
@@ -76,8 +77,7 @@ def __repr__(self):
def __str__(self):
return f'<{type(self).__name__} {self._format()}>'
- def __class_getitem__(cls, type):
- return cls
+ __class_getitem__ = classmethod(GenericAlias)
def _format(self):
result = f'maxsize={self._maxsize!r}'
diff --git a/Lib/asyncio/tasks.py b/Lib/asyncio/tasks.py
index 27a3c8c5a88df..39bd068535668 100644
--- a/Lib/asyncio/tasks.py
+++ b/Lib/asyncio/tasks.py
@@ -17,6 +17,7 @@
import types
import warnings
import weakref
+from types import GenericAlias
from . import base_tasks
from . import coroutines
@@ -147,8 +148,7 @@ def __del__(self):
self._loop.call_exception_handler(context)
super().__del__()
- def __class_getitem__(cls, type):
- return cls
+ __class_getitem__ = classmethod(GenericAlias)
def _repr_info(self):
return base_tasks._task_repr_info(self)
diff --git a/Lib/test/test_asyncio/test_futures.py b/Lib/test/test_asyncio/test_futures.py
index c16bfc08a7abe..939ad7be6a436 100644
--- a/Lib/test/test_asyncio/test_futures.py
+++ b/Lib/test/test_asyncio/test_futures.py
@@ -7,7 +7,7 @@
import threading
import unittest
from unittest import mock
-
+from types import GenericAlias
import asyncio
from asyncio import futures
from test.test_asyncio import utils as test_utils
@@ -109,6 +109,11 @@ def setUp(self):
self.loop = self.new_test_loop()
self.addCleanup(self.loop.close)
+ def test_generic_alias(self):
+ future = self.cls[str]
+ self.assertEqual(future.__args__, (str,))
+ self.assertIsInstance(future, GenericAlias)
+
def test_isfuture(self):
class MyFuture:
_asyncio_future_blocking = None
diff --git a/Lib/test/test_asyncio/test_queues.py b/Lib/test/test_asyncio/test_queues.py
index 81e888fbce6db..90d352276c9d6 100644
--- a/Lib/test/test_asyncio/test_queues.py
+++ b/Lib/test/test_asyncio/test_queues.py
@@ -4,6 +4,7 @@
from unittest import mock
import asyncio
+from types import GenericAlias
from test.test_asyncio import utils as test_utils
@@ -92,6 +93,11 @@ def test_repr(self):
def test_str(self):
self._test_repr_or_str(str, False)
+ def test_generic_alias(self):
+ q = asyncio.Queue[int]
+ self.assertEqual(q.__args__, (int,))
+ self.assertIsInstance(q, GenericAlias)
+
def test_empty(self):
with self.assertWarns(DeprecationWarning):
q = asyncio.Queue(loop=self.loop)
diff --git a/Lib/test/test_asyncio/test_tasks.py b/Lib/test/test_asyncio/test_tasks.py
index a6afce0766493..2f016740b9e76 100644
--- a/Lib/test/test_asyncio/test_tasks.py
+++ b/Lib/test/test_asyncio/test_tasks.py
@@ -9,12 +9,13 @@
import random
import re
import sys
+import types
import textwrap
import traceback
-import types
import unittest
import weakref
from unittest import mock
+from types import GenericAlias
import asyncio
from asyncio import coroutines
@@ -120,6 +121,12 @@ def setUp(self):
self.loop.set_task_factory(self.new_task)
self.loop.create_future = lambda: self.new_future(self.loop)
+
+ def test_generic_alias(self):
+ task = self.__class__.Task[str]
+ self.assertEqual(task.__args__, (str,))
+ self.assertIsInstance(task, GenericAlias)
+
def test_task_cancel_message_getter(self):
async def coro():
pass
diff --git a/Misc/NEWS.d/next/Library/2022-01-22-05-05-08.bpo-46469.plUab5.rst b/Misc/NEWS.d/next/Library/2022-01-22-05-05-08.bpo-46469.plUab5.rst
new file mode 100644
index 0000000000000..0d0e4b5d3d735
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-01-22-05-05-08.bpo-46469.plUab5.rst
@@ -0,0 +1 @@
+:mod:`asyncio` generic classes now return :class:`types.GenericAlias` in ``__class_getitem__`` instead of the same class.
\ No newline at end of file
diff --git a/Modules/_asynciomodule.c b/Modules/_asynciomodule.c
index a1421cf5dbec8..b64069a25a743 100644
--- a/Modules/_asynciomodule.c
+++ b/Modules/_asynciomodule.c
@@ -1474,13 +1474,6 @@ FutureObj_finalize(FutureObj *fut)
PyErr_Restore(error_type, error_value, error_traceback);
}
-static PyObject *
-future_cls_getitem(PyObject *cls, PyObject *type)
-{
- Py_INCREF(cls);
- return cls;
-}
-
static PyAsyncMethods FutureType_as_async = {
(unaryfunc)future_new_iter, /* am_await */
0, /* am_aiter */
@@ -1500,7 +1493,7 @@ static PyMethodDef FutureType_methods[] = {
_ASYNCIO_FUTURE_GET_LOOP_METHODDEF
_ASYNCIO_FUTURE__MAKE_CANCELLED_ERROR_METHODDEF
_ASYNCIO_FUTURE__REPR_INFO_METHODDEF
- {"__class_getitem__", future_cls_getitem, METH_O|METH_CLASS, NULL},
+ {"__class_getitem__", Py_GenericAlias, METH_O|METH_CLASS, PyDoc_STR("See PEP 585")},
{NULL, NULL} /* Sentinel */
};
@@ -2487,13 +2480,6 @@ TaskObj_finalize(TaskObj *task)
FutureObj_finalize((FutureObj*)task);
}
-static PyObject *
-task_cls_getitem(PyObject *cls, PyObject *type)
-{
- Py_INCREF(cls);
- return cls;
-}
-
static void TaskObj_dealloc(PyObject *); /* Needs Task_CheckExact */
static PyMethodDef TaskType_methods[] = {
@@ -2513,7 +2499,7 @@ static PyMethodDef TaskType_methods[] = {
_ASYNCIO_TASK_GET_NAME_METHODDEF
_ASYNCIO_TASK_SET_NAME_METHODDEF
_ASYNCIO_TASK_GET_CORO_METHODDEF
- {"__class_getitem__", task_cls_getitem, METH_O|METH_CLASS, NULL},
+ {"__class_getitem__", Py_GenericAlias, METH_O|METH_CLASS, PyDoc_STR("See PEP 585")},
{NULL, NULL} /* Sentinel */
};
More information about the Python-checkins
mailing list