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
Next Next commit
added exception groups
  • Loading branch information
@iritkatriel
iritkatriel committed May 11, 2021
commit af3c3f72d4a274e5d4d47be25d4dc8a5fae7facd
6 changes: 6 additions & 0 deletions Include/cpython/pyerrors.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,12 @@ typedef struct {
PyException_HEAD
} PyBaseExceptionObject;

typedef struct {
PyException_HEAD
PyObject *msg;
PyObject *excs;
} PyBaseExceptionGroupObject;

typedef struct {
PyException_HEAD
PyObject *msg;
Expand Down
2 changes: 2 additions & 0 deletions Include/pyerrors.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@ PyAPI_FUNC(const char *) PyExceptionClass_Name(PyObject *);

PyAPI_DATA(PyObject *) PyExc_BaseException;
PyAPI_DATA(PyObject *) PyExc_Exception;
PyAPI_DATA(PyObject *) PyExc_BaseExceptionGroup;
PyAPI_DATA(PyObject *) PyExc_ExceptionGroup;
Comment thread
iritkatriel marked this conversation as resolved.
Outdated
#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03050000
PyAPI_DATA(PyObject *) PyExc_StopAsyncIteration;
#endif
Expand Down
2 changes: 2 additions & 0 deletions Lib/test/exception_hierarchy.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ BaseException
+-- SystemExit
+-- KeyboardInterrupt
+-- GeneratorExit
+-- BaseExceptionGroup
+-- Exception
+-- ExceptionGroup
Copy link
Copy Markdown
Member Author

@iritkatriel iritkatriel Apr 16, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unfortunately we can't express here that ExceptionGroup subclasses BaseExceptionGroup as well.

Copy link
Copy Markdown
Member

@gvanrossum gvanrossum Apr 16, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add a note in parentheses?

Copy link
Copy Markdown
Member Author

@iritkatriel iritkatriel Apr 16, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There seems to be an unused feature that interprets whatever is in "(..)" as a platform name and then ignores any exception where the platform is not the current platform (so it won't break the test but will weaken it).

But "[...]" seems ok - anything in them appears to be ignored, and when I changed ExceptionGroup to something invalid the test failed.

cpython/Lib/test/test_baseexception.py

Line 49 in 8bbfeb3

if '(' in exc_name:

+-- StopIteration
+-- StopAsyncIteration
+-- ArithmeticError
Expand Down
6 changes: 5 additions & 1 deletion Lib/test/test_descr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4026,7 +4026,11 @@ def test_builtin_bases(self):
for tp in builtin_types:
object.__getattribute__(tp, "__bases__")
if tp is not object:
self.assertEqual(len(tp.__bases__), 1, tp)
if tp is ExceptionGroup:
num_bases = 2
else:
num_bases = 1
self.assertEqual(len(tp.__bases__), num_bases, tp)

class L(list):
pass
Expand Down
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) < 836 # approximate number of objects with docstrings
>>> 816 < len(tests) < 838 # 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
Loading