mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-10 11:58:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

[3.12] gh-119011: type.__type_params__ now return an empty tuple (GH-119296) (#119681)

Browse source 
(cherry picked from commit 6b240c2308)

Co-authored-by: Nikita Sobolev <mail@sobolevn.me>
This commit is contained in:
Jelle Zijlstra 2024-05-28 12:54:47 -07:00 • committed by GitHub
parent 08636c1a7d
commit 7f06cd335e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 19 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Lib/test/test_functools.py
View file

@ -705,6 +705,14 @@ class TestUpdateWrapper(unittest.TestCase):
self.assertTrue(wrapper.__doc__.startswith('max('))
self.assertEqual(wrapper.__annotations__, {})
def test_update_type_wrapper(self):
def wrapper(*args): pass
functools.update_wrapper(wrapper, type)
self.assertEqual(wrapper.__name__, 'type')
self.assertEqual(wrapper.__annotations__, {})
self.assertEqual(wrapper.__type_params__, ())
class TestWraps(TestUpdateWrapper):

5
Lib/test/test_type_params.py
View file

@ -499,6 +499,11 @@ class TypeParamsAccessTest(unittest.TestCase):
r"Cannot use [a-z]+ in annotation scope within class scope"):
run_code(code.format(case))
def test_type_special_case(self):
# https://github.com/python/cpython/issues/119011
self.assertEqual(type.__type_params__, ())
self.assertEqual(object.__type_params__, ())
def make_base(arg):
class Base:

2
Misc/NEWS.d/next/Core and Builtins/2024-05-21-09-46-51.gh-issue-119011.WOe3bu.rst Normal file
View file

@ -0,0 +1,2 @@
Fixes ``type.__type_params__`` to return an empty tuple instead of a
descriptor.

5
Objects/typeobject.c
View file

@ -1506,8 +1506,11 @@ type_set_annotations(PyTypeObject *type, PyObject *value, void *context)
static PyObject *
type_get_type_params(PyTypeObject *type, void *context)
{
PyObject *params = PyDict_GetItemWithError(lookup_tp_dict(type), &_Py_ID(__type_params__));
if (type == &PyType_Type) {
return PyTuple_New(0);
}
PyObject *params = PyDict_GetItemWithError(lookup_tp_dict(type), &_Py_ID(__type_params__));
if (params) {
return Py_NewRef(params);
}