Merge branch 'mailbox_with_context_manager' of https://github.com/sblondon/cpython into mailbox_with_context_manager

sblondon · sblondon · commit bb790e5c8d02 · 2019-08-04T22:15:24.000+02:00
diff --git a/Doc/library/mailbox.rst b/Doc/library/mailbox.rst
@@ -81,7 +81,7 @@ Supported mailbox formats are Maildir, mbox, MH, Babyl, and MMDF.
    enters and releases it and :meth:`close` when the :keyword:`with` statement
    exits.
 
-   .. versionchanged:: 3.7
+   .. versionchanged:: 3.9
       Support for the :keyword:`with` statement was added.
 
    :class:`Mailbox` instances have the following methods:
diff --git a/Misc/NEWS.d/next/Library/2017-12-15-09-32-57.bpo-32234.XaOkhR.rst b/Misc/NEWS.d/next/Library/2017-12-15-09-32-57.bpo-32234.XaOkhR.rst
@@ -1,2 +1,2 @@
-Mailbox instances can be used in the context manager. The Mailbox is locked
+Mailbox instances can be used as a context manager. The Mailbox is locked
 at enter and unlocked and closed at exit.

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-Mailbox instances can be used in the context manager. The Mailbox is locked`
	`1`	`+Mailbox instances can be used as a context manager. The Mailbox is locked`
`2`	`2`	`at enter and unlocked and closed at exit.`