https://github.com/python/cpython/commit/0268b072d84bc4be890d1b7459815ba1cb9f9945
commit: 0268b072d84bc4be890d1b7459815ba1cb9f9945
branch: main
author: Jelle Zijlstra <[email protected]>
committer: JelleZijlstra <[email protected]>
date: 2024-09-25T23:30:17Z
summary:
gh-119180: Disallow instantiation of ConstEvaluator objects (#124561)
files:
M Lib/test/test_type_params.py
M Objects/typevarobject.c
diff --git a/Lib/test/test_type_params.py b/Lib/test/test_type_params.py
index dc0c0d0829f8d3..8c21553e410d8a 100644
--- a/Lib/test/test_type_params.py
+++ b/Lib/test/test_type_params.py
@@ -1452,3 +1452,14 @@ def f[T: (int, str)](): pass
self.assertEqual(annotationlib.call_evaluate_function(case.evaluate_constraints,
annotationlib.Format.VALUE), (int, str))
self.assertEqual(annotationlib.call_evaluate_function(case.evaluate_constraints,
annotationlib.Format.FORWARDREF), (int, str))
self.assertEqual(annotationlib.call_evaluate_function(case.evaluate_constraints,
annotationlib.Format.SOURCE), '(int, str)')
+
+ def test_const_evaluator(self):
+ T = TypeVar("T", bound=int)
+ self.assertEqual(repr(T.evaluate_bound), "<constevaluator <class
'int'>>")
+
+ ConstEvaluator = type(T.evaluate_bound)
+
+ with self.assertRaisesRegex(TypeError, r"cannot create
'_typing\._ConstEvaluator' instances"):
+ ConstEvaluator() # This used to segfault.
+ with self.assertRaisesRegex(TypeError, r"cannot set 'attribute'
attribute of immutable type '_typing\._ConstEvaluator'"):
+ ConstEvaluator.attribute = 1
diff --git a/Objects/typevarobject.c b/Objects/typevarobject.c
index d3656155fae330..09e9ab39364742 100644
--- a/Objects/typevarobject.c
+++ b/Objects/typevarobject.c
@@ -151,7 +151,7 @@ constevaluator_clear(PyObject *self)
}
static PyObject *
-constevaluator_repr(PyObject *self, PyObject *repr)
+constevaluator_repr(PyObject *self)
{
PyObject *value = ((constevaluatorobject *)self)->value;
return PyUnicode_FromFormat("<constevaluator %R>", value);
@@ -242,7 +242,8 @@ static PyType_Slot constevaluator_slots[] = {
PyType_Spec constevaluator_spec = {
.name = "_typing._ConstEvaluator",
.basicsize = sizeof(constevaluatorobject),
- .flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC |
Py_TPFLAGS_IMMUTABLETYPE,
+ .flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC | Py_TPFLAGS_IMMUTABLETYPE
+ | Py_TPFLAGS_DISALLOW_INSTANTIATION,
.slots = constevaluator_slots,
};
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
