From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Wed, 11 Sep 2019 15:08:47 +0000 (-0700)
Subject: bpo-37651: Document CancelledError is now a subclass of BaseException (GH-15950)
X-Git-Tag: v3.8.0rc1~174
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e784bb7c6b2a52e80d7c03cb85e5faab11a1ccbd;p=python

bpo-37651: Document CancelledError is now a subclass of BaseException (GH-15950)


https://bugs.python.org/issue37651

Automerge-Triggered-By: @1st1
(cherry picked from commit 7b69069e9aa0047a0dbe8af1a67aa2b355dc68d8)

Co-authored-by: Xtreak <tir.karthi@gmail.com>
---

diff --git a/Doc/library/asyncio-exceptions.rst b/Doc/library/asyncio-exceptions.rst
index e49577a203..b1e6ecfda1 100644
--- a/Doc/library/asyncio-exceptions.rst
+++ b/Doc/library/asyncio-exceptions.rst
@@ -25,26 +25,9 @@ Exceptions
    when asyncio Tasks are cancelled.  In almost all situations the
    exception must be re-raised.
 
-   .. important::
-
-      This exception is a subclass of :exc:`Exception`, so it can be
-      accidentally suppressed by an overly broad ``try..except`` block::
-
-        try:
-            await operation
-        except Exception:
-            # The cancellation is broken because the *except* block
-            # suppresses the CancelledError exception.
-            log.log('an error has occurred')
-
-      Instead, the following pattern should be used::
+   .. versionchanged:: 3.8
 
-        try:
-            await operation
-        except asyncio.CancelledError:
-            raise
-        except Exception:
-            log.log('an error has occurred')
+      :exc:`CancelledError` is now a subclass of :class:`BaseException`.
 
 
 .. exception:: InvalidStateError