Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 16 additions & 0 deletions Lib/test/test_typing.py
Original file line number Diff line number Diff line change
Expand Up @@ -6053,6 +6053,22 @@ class A:
with self.assertRaises(TypeError):
a[int]

def test_parameter_added_after_parameters_cached(self):
# gh-155752: GenericAlias parameters are cached before substitution, so
# an argument can gain __typing_subst__ after the tuple is calculated.
class Parameter:
pass

first = Parameter()
first.__typing_subst__ = lambda value: value
late = Parameter()
alias = types.GenericAlias(dict, (first, late))
self.assertEqual(alias.__parameters__, (first,))
late.__typing_subst__ = lambda value: value

with self.assertRaisesRegex(TypeError, "not found in __parameters__"):
alias[0]

def test_return_non_tuple_while_unpacking(self):
# GH-138497: GenericAlias objects didn't ensure that __typing_subst__ actually
# returned a tuple
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix a crash when a :class:`types.GenericAlias` argument gains a
``__typing_subst__`` hook after the alias parameters have been cached.
14 changes: 12 additions & 2 deletions Objects/genericaliasobject.c
Original file line number Diff line number Diff line change
Expand Up @@ -524,8 +524,18 @@ _Py_subs_parameters(PyObject *self, PyObject *args, PyObject *parameters, PyObje
}
if (subst) {
Py_ssize_t iparam = tuple_index(parameters, nparams, arg);
assert(iparam >= 0);
arg = PyObject_CallOneArg(subst, argitems[iparam]);
if (iparam < 0) {
// __parameters__ may be stale if an argument gained
// __typing_subst__ after the tuple was computed.
PyErr_Format(PyExc_TypeError,
"argument %R with __typing_subst__ was not found "
"in __parameters__",
arg);
arg = NULL;
}
else {
arg = PyObject_CallOneArg(subst, argitems[iparam]);
}
Py_DECREF(subst);
}
else {
Expand Down
Loading