address review comments

Zac-HD · Zac-HD · commit b8bc1367a06b · 2023-11-09T20:59:29.000-08:00
diff --git a/Doc/library/contextlib.rst b/Doc/library/contextlib.rst
@@ -311,10 +311,6 @@ Functions and classes provided:
    .. versionadded:: 3.4
 
    .. versionchanged:: 3.12
-      ``suppress`` now supports suppressing exceptions raised as
-      part of an :exc:`ExceptionGroup`.
-
-   .. versionchanged:: 3.12.1
       ``suppress`` now supports suppressing exceptions raised as
       part of an :exc:`BaseExceptionGroup`.
 
diff --git a/Lib/test/test_contextlib.py b/Lib/test/test_contextlib.py
@@ -1301,6 +1301,20 @@ def test_exception_groups(self):
         # we don't accidentally discard a ctrl-c with KeyboardInterrupt.
         with suppress(GeneratorExit):
             raise BaseExceptionGroup("message", [GeneratorExit()])
+        # If we raise a BaseException group, we can still suppress parts
+        with self.assertRaises(BaseExceptionGroup) as eg1:
+            with suppress(KeyError):
+                raise BaseExceptionGroup("message", [GeneratorExit("g"), KeyError("k")])
+        self.assertExceptionIsLike(
+            eg1.exception, BaseExceptionGroup("message", [GeneratorExit("g")]),
+        )
+        # If we suppress all the leaf BaseExceptions, we get a non-base ExceptionGroup
+        with self.assertRaises(ExceptionGroup) as eg1:
+            with suppress(GeneratorExit):
+                raise BaseExceptionGroup("message", [GeneratorExit("g"), KeyError("k")])
+        self.assertExceptionIsLike(
+            eg1.exception, ExceptionGroup("message", [KeyError("k")]),
+        )
 
 
 class TestChdir(unittest.TestCase):
