Merge remote-tracking branch 'origin/master' into cancelstatus

python-trio · njsmith · May 6, 2019 · Feb 28, 2019 · Mar 1, 2019 · Mar 8, 2019
commit 173da307580faca2890876ec3d3dee33ef60f7a9
diff --git a/docs/source/reference-core.rst b/docs/source/reference-core.rst
@@ -514,11 +514,6 @@ objects.
       exception, and (2) this scope is the one that was responsible
       for triggering this :exc:`~trio.Cancelled` exception.
 
-      If the same :class:`CancelScope` is reused for multiple ``with``
-      blocks, the :attr:`cancelled_caught` attribute applies to the
-      most recent ``with`` block. (It is reset to :data:`False` each
-      time a new ``with`` block is entered.)
-
    .. autoattribute:: cancel_called