ilusha/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython synced 2026-09-29 11:55:30 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

gh-105730: support more callables in ExceptionGroup.split() and subgroup() (#106035)

Browse source
This commit is contained in:
Irit Katriel 2023-06-23 19:47:47 +01:00 • committed by GitHub
parent 1d33d53780
commit d8ca5a11bc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 59 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Objects/exceptions.c
View file

@ -992,7 +992,7 @@ get_matcher_type(PyObject *value,
{
assert(value);
if (PyFunction_Check(value)) {
if (PyCallable_Check(value) && !PyType_Check(value)) {
*type = EXCEPTION_GROUP_MATCH_BY_PREDICATE;
return 0;
}
@ -1016,7 +1016,7 @@ get_matcher_type(PyObject *value,
error:
PyErr_SetString(
PyExc_TypeError,
"expected a function, exception type or tuple of exception types");
"expected an exception type, a tuple of exception types, or a callable (other than a class)");
return -1;
}
@ -1032,7 +1032,7 @@ exceptiongroup_split_check_match(PyObject *exc,
return PyErr_GivenExceptionMatches(exc, matcher_value);
}
case EXCEPTION_GROUP_MATCH_BY_PREDICATE: {
assert(PyFunction_Check(matcher_value));
assert(PyCallable_Check(matcher_value) && !PyType_Check(matcher_value));
PyObject *exc_matches = PyObject_CallOneArg(matcher_value, exc);
if (exc_matches == NULL) {
return -1;