summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIrit Katriel <1055913+iritkatriel@users.noreply.github.com>2023-05-03 20:55:19 (GMT)
committerGitHub <noreply@github.com>2023-05-03 20:55:19 (GMT)
commit9f9e001ab2ab67acdb2e0383a25ab4c164608a47 (patch)
treee92ab23616a9af42529a0b02662790dc2707618f
parentda1980afcb8820ffaa0574df735bc39b1a276a76 (diff)
downloadcpython-9f9e001ab2ab67acdb2e0383a25ab4c164608a47.zip
cpython-9f9e001ab2ab67acdb2e0383a25ab4c164608a47.tar.gz
cpython-9f9e001ab2ab67acdb2e0383a25ab4c164608a47.tar.bz2
gh-103590: mention that the change is included in 3.11.4 and clarify except* documentation (#104095)
-rw-r--r--Doc/reference/compound_stmts.rst6
-rw-r--r--Doc/whatsnew/3.12.rst3
2 files changed, 6 insertions, 3 deletions
diff --git a/Doc/reference/compound_stmts.rst b/Doc/reference/compound_stmts.rst
index f0a8936c..0731589 100644
--- a/Doc/reference/compound_stmts.rst
+++ b/Doc/reference/compound_stmts.rst
@@ -362,8 +362,10 @@ one :keyword:`!except*` clause, the first that matches it. ::
Any remaining exceptions that were not handled by any :keyword:`!except*`
-clause are re-raised at the end, combined into an exception group along with
-all exceptions that were raised from within :keyword:`!except*` clauses.
+clause are re-raised at the end, along with all exceptions that were
+raised from within the :keyword:`!except*` clauses. If this list contains
+more than one exception to reraise, they are combined into an exception
+group.
If the raised exception is not an exception group and its type matches
one of the :keyword:`!except*` clauses, it is caught and wrapped by an
diff --git a/Doc/whatsnew/3.12.rst b/Doc/whatsnew/3.12.rst
index 94b44ed..49f9bd2 100644
--- a/Doc/whatsnew/3.12.rst
+++ b/Doc/whatsnew/3.12.rst
@@ -239,7 +239,8 @@ Other Language Changes
* When a ``try-except*`` construct handles the entire :exc:`ExceptionGroup`
and raises one other exception, that exception is no longer wrapped in an
- :exc:`ExceptionGroup`. (Contributed by Irit Katriel in :gh:`103590`.)
+ :exc:`ExceptionGroup`. Also changed in version 3.11.4. (Contributed by Irit
+ Katriel in :gh:`103590`.)
New Modules