Skip to content

added exception groups #25430

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

Closed
iritkatriel wants to merge 10 commits into from
Closed

added exception groups #25430

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
af3c3f7
added exception groups
iritkatriel Apr 15, 2021
c1d592f
fix build on mac/ubuntu
iritkatriel Apr 16, 2021
187b10d
+-- ExceptionGroup [BaseExceptionGroup] in exception_hierarchy.txt
iritkatriel Apr 16, 2021
a6d6d71
regenerated Python/importlib_external.h
iritkatriel Apr 16, 2021
9ffd6e5
fix smelly symbol and whitespace
iritkatriel Apr 16, 2021
5f05645
detect matcher type only once. Add option to match by instance(s)-equ…
iritkatriel Apr 19, 2021
0a9e6b5
regenerated Python/importlib_external.h
iritkatriel May 11, 2021
aed5cff
regenerated PC/python3dll.c
iritkatriel May 12, 2021
291be68
updated Doc/data/stable_abi.dat and regenerated PC/python3dll.c, Doc/…
iritkatriel May 12, 2021
5b3dfe2
updated Misc/stable_abi.txt
iritkatriel May 12, 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
fix build on mac/ubuntu
  • Loading branch information
@iritkatriel
iritkatriel committed May 11, 2021
commit c1d592f62a10bd38d34e43ba54b8cf91d15a758a
2 changes: 1 addition & 1 deletion Lib/test/test_doctest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -668,7 +668,7 @@ def non_Python_modules(): r"""

>>> import builtins
>>> tests = doctest.DocTestFinder().find(builtins)
>>> 816 < len(tests) < 838 # approximate number of objects with docstrings
>>> 816 < len(tests) < 840 # approximate number of objects with docstrings
True
>>> real_tests = [t for t in tests if len(t.examples) > 0]
>>> len(real_tests) # objects that actually have doctests
Expand Down
30 changes: 16 additions & 14 deletions Objects/exceptions.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -629,7 +629,14 @@ ComplexExtendsException(PyExc_BaseException, SystemExit, SystemExit,
* ExceptionGroup extends BaseExceptionGroup and Exception
*/

static PyObject *PyExc_ExceptionGroup;
PyObject *PyExc_ExceptionGroup;

static inline PyBaseExceptionGroupObject*
_PyBaseExceptionGroupObject_cast(PyObject *exc)
{
assert(PyObject_TypeCheck(exc, (PyTypeObject *)PyExc_BaseExceptionGroup));
return (PyBaseExceptionGroupObject *)exc;
}

static PyObject *
BaseExceptionGroup_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
Expand Down Expand Up @@ -696,7 +703,7 @@ BaseExceptionGroup_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
}

PyBaseExceptionGroupObject *self =
(PyBaseExceptionGroupObject*)BaseException_new(cls, args, kwds);
_PyBaseExceptionGroupObject_cast(BaseException_new(cls, args, kwds));
self->msg = Py_NewRef(msg);
self->excs = PySequence_Tuple(excs);
return (PyObject*)self;
Expand Down Expand Up @@ -752,9 +759,8 @@ BaseExceptionGroup_str(PyBaseExceptionGroupObject *self)
}

static PyObject *
BaseExceptionGroup_derive(PyBaseExceptionGroupObject *self,
PyObject *args, PyObject *kwds) {

BaseExceptionGroup_derive(PyObject *self_, PyObject *args, PyObject *kwds) {
PyBaseExceptionGroupObject *self = _PyBaseExceptionGroupObject_cast(self_);
PyObject *excs = NULL;
if (!PyArg_ParseTuple(args, "O", &excs)) {
return NULL;
Expand Down Expand Up @@ -861,7 +867,7 @@ exceptiongroup_split_recursive(PyObject *exc, PyObject *matcher, int complement)
}
else {
/* Partial match */
PyBaseExceptionGroupObject *eg = (PyBaseExceptionGroupObject *)exc;
PyBaseExceptionGroupObject *eg = _PyBaseExceptionGroupObject_cast(exc);
PyObject *match_list = NULL;
PyObject *rest_list = NULL;
PyObject *match_exc = NULL;
Expand Down Expand Up @@ -941,31 +947,27 @@ exceptiongroup_split_recursive(PyObject *exc, PyObject *matcher, int complement)
}

static PyObject *
BaseExceptionGroup_split(PyBaseExceptionGroupObject *self,
PyObject *args,
PyObject *kwds)
BaseExceptionGroup_split(PyObject *self, PyObject *args, PyObject *kwds)
{
PyObject *matcher = NULL;
if (!PyArg_UnpackTuple(args, "split", 1, 1, &matcher)) {
return NULL;
}

return exceptiongroup_split_recursive(
(PyObject*)self, matcher, 1 /* with_complement */);
self, matcher, 1 /* with_complement */);
}

static PyObject *
BaseExceptionGroup_subgroup(PyBaseExceptionGroupObject *self,
PyObject *args,
PyObject *kwds)
BaseExceptionGroup_subgroup(PyObject *self, PyObject *args, PyObject *kwds)
{
PyObject *matcher = NULL;
if (!PyArg_UnpackTuple(args, "subgroup", 1, 1, &matcher)) {
return NULL;
}

PyObject *ret = exceptiongroup_split_recursive(
(PyObject*)self, matcher, 0 /* without complement */);
self, matcher, 0 /* without complement */);

if (!ret) {
return NULL;
Expand Down