Visitar URL original
bpo-45292: [PEP 654] add the ExceptionGroup and BaseExceptionGroup classes by iritkatriel · Pull Request #28569 · python/cpython · GitHub
Skip to content

bpo-45292: [PEP 654] add the ExceptionGroup and BaseExceptionGroup classes #28569

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
iritkatriel merged 40 commits into from
Oct 22, 2021
Merged

bpo-45292: [PEP 654] add the ExceptionGroup and BaseExceptionGroup classes #28569

Changes from 1 commit
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
2b5800f
bpo-45292: [PEP 654] added ExceptionGroup and BaseExceptionGroup (did…
iritkatriel Apr 15, 2021
0ac0dfd
📜🤖 Added by blurb_it.
blurb-it[bot] Sep 26, 2021
b7ee952
rename exceptions_added_in_python_3 --> exceptions_not_in_python_2
iritkatriel Sep 27, 2021
a57f883
Use PyArg_ParseTuple's format string to check for type of EG message
iritkatriel Sep 27, 2021
62a7b3c
improve error messages for second constructor arg
iritkatriel Sep 27, 2021
235504b
nested exception must be instance not type
iritkatriel Sep 27, 2021
b7889df
tweak test
iritkatriel Sep 27, 2021
763a387
expect msg to always be valid
iritkatriel Sep 27, 2021
8912054
make [Base]ExceptionGroup generic types
iritkatriel Oct 1, 2021
41d4799
tidy up test_pickle
iritkatriel Oct 5, 2021
488ad7c
add test that exception group is not subscriptable (generic type)
iritkatriel Oct 5, 2021
1de7ca5
implement suggestions from Erlend
iritkatriel Oct 7, 2021
1147f44
add comment
iritkatriel Oct 7, 2021
c71aff7
part of updates re Guido's review of the tests
iritkatriel Oct 16, 2021
d3ba995
Part 1 of Gregory's review: better error messaages, public GC API, bo…
iritkatriel Oct 17, 2021
fe5d611
Gregory's suggestion to convert excs to Tuple at the beginning of the…
iritkatriel Oct 17, 2021
ed343de
rename constructor args to match their python names
iritkatriel Oct 17, 2021
1af4e53
empty-exceptions error changed from TypeError to ValueError
iritkatriel Oct 17, 2021
bc57273
decref bases in create_exception_group_class
iritkatriel Oct 18, 2021
a21c174
remove redundant check
iritkatriel Oct 18, 2021
0e46247
add _PyBaseExceptionGroup_Check
iritkatriel Oct 18, 2021
84c52ae
Fix error checking. Exception --> assertion
iritkatriel Oct 18, 2021
1813827
add assertions, convert runtime check to assertion
iritkatriel Oct 18, 2021
3201ab9
NULL is not error for GetContext/SetContext etc (no need to check)
iritkatriel Oct 18, 2021
37d8df2
cast orig only once in exceptiongroup_subset
iritkatriel Oct 18, 2021
0099c24
assume (and assert) that eg->excs is a tuple, use Tuple apis
iritkatriel Oct 18, 2021
bab699b
no need for the fancy _exceptiongroup_matcher struct
iritkatriel Oct 18, 2021
0603d31
move ExceptionGroup type definition to interpreter state
iritkatriel Oct 19, 2021
db8d0b2
clear ExceptionGroupType before interpreter state
iritkatriel Oct 19, 2021
ba762bc
remove PyExc_ExceptionGroup from stable abi and header
iritkatriel Oct 19, 2021
005cf86
do type cast only once
iritkatriel Oct 19, 2021
db8c3ea
add comments and assertions
iritkatriel Oct 20, 2021
7252b3a
remove inefficient packing-unpacking of match-rest pairs in a tuple
iritkatriel Oct 20, 2021
ea68786
Py_CLEAR --> Py_DECREF
iritkatriel Oct 20, 2021
efa9adb
fix segfault
iritkatriel Oct 21, 2021
cd61b77
clear match and rest in exceptiongroup_split_recursive when there is …
iritkatriel Oct 21, 2021
c463d4c
make the tests less crazy
iritkatriel Oct 21, 2021
4d76ccc
make regen-limited-abi
iritkatriel Oct 22, 2021
26b0426
use :pep: syntax in the news entry.
gpshead Oct 22, 2021
dbd72d1
add recursion guard in split
iritkatriel Oct 22, 2021
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
Prev Previous commit
Next Next commit
clear match and rest in exceptiongroup_split_recursive when there is … 
…an error. Tidy up error handling.
  • Loading branch information
@iritkatriel
iritkatriel committed Oct 22, 2021
commit cd61b77dc3839ab123ee88a4b113dd09fe7d38d7
39 changes: 21 additions & 18 deletions Objects/exceptions.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -957,22 +957,21 @@ exceptiongroup_split_recursive(PyObject *exc,

/* Partial match */

int retval = -1;

PyBaseExceptionGroupObject *eg = _PyBaseExceptionGroupObject_cast(exc);
PyObject *match_list = NULL;
PyObject *rest_list = NULL;

assert(PyTuple_CheckExact(eg->excs));
Py_ssize_t num_excs = PyTuple_Size(eg->excs);
if (num_excs < 0) {
goto done;
return -1;
}
assert(num_excs > 0); /* checked in constructor, and excs is read-only */
Comment thread
iritkatriel marked this conversation as resolved.
Outdated
match_list = PyList_New(0);

int retval = -1;
PyObject *match_list = PyList_New(0);
if (!match_list) {
goto done;
return -1;
}

PyObject *rest_list = NULL;
if (construct_rest) {
rest_list = PyList_New(0);
if (!rest_list) {
Expand All @@ -986,8 +985,8 @@ exceptiongroup_split_recursive(PyObject *exc,
if (exceptiongroup_split_recursive(
e, matcher_type, matcher_value,
construct_rest, &rec_result) == -1) {
Py_XDECREF(rec_result.match);
Py_XDECREF(rec_result.rest);
assert(!rec_result.match);
assert(!rec_result.rest);
goto done;
}
if (rec_result.match) {
Expand Down Expand Up @@ -1025,6 +1024,10 @@ exceptiongroup_split_recursive(PyObject *exc,
done:
Py_DECREF(match_list);
Py_XDECREF(rest_list);
if (retval == -1) {
Py_CLEAR(result->match);
Py_CLEAR(result->rest);
}
return retval;
}

Expand All @@ -1041,18 +1044,18 @@ BaseExceptionGroup_split(PyObject *self, PyObject *args)
return NULL;
}

PyObject *result = NULL;
_exceptiongroup_split_result split_result;
bool construct_rest = true;
if (exceptiongroup_split_recursive(
self, matcher_type, matcher_value,
construct_rest, &split_result) != -1) {
construct_rest, &split_result) == -1) {
return NULL;
}

result = PyTuple_Pack(
PyObject *result = PyTuple_Pack(
2,
split_result.match ? split_result.match : Py_None,
split_result.rest ? split_result.rest : Py_None);
}

Py_XDECREF(split_result.match);
Py_XDECREF(split_result.rest);
Expand All @@ -1072,16 +1075,16 @@ BaseExceptionGroup_subgroup(PyObject *self, PyObject *args)
return NULL;
}

PyObject *result = NULL;
_exceptiongroup_split_result split_result;
bool construct_rest = false;
if (exceptiongroup_split_recursive(
self, matcher_type, matcher_value,
construct_rest, &split_result) != -1) {
construct_rest, &split_result) == -1) {
return NULL;
}

result = Py_NewRef(
PyObject *result = Py_NewRef(
split_result.match ? split_result.match : Py_None);
}

Py_XDECREF(split_result.match);
assert(!split_result.rest);
Expand Down