Issue #22369: Change "context manager protocol" to "context management protocol".
diff --git a/Doc/library/asyncio-sync.rst b/Doc/library/asyncio-sync.rst
index 049a0cc..cc80bd7 100644
--- a/Doc/library/asyncio-sync.rst
+++ b/Doc/library/asyncio-sync.rst
@@ -34,7 +34,7 @@
:meth:`acquire` is a coroutine and should be called with ``yield from``.
- Locks also support the context manager protocol. ``(yield from lock)``
+ Locks also support the context management protocol. ``(yield from lock)``
should be used as context manager expression.
Usage::
@@ -229,7 +229,7 @@
counter can never go below zero; when :meth:`acquire` finds that it is zero,
it blocks, waiting until some other thread calls :meth:`release`.
- Semaphores also support the context manager protocol.
+ Semaphores also support the context management protocol.
The optional argument gives the initial value for the internal counter; it
defaults to ``1``. If the value given is less than ``0``, :exc:`ValueError`
diff --git a/Doc/library/mailbox.rst b/Doc/library/mailbox.rst
index 0478ed1..a03fd1c 100644
--- a/Doc/library/mailbox.rst
+++ b/Doc/library/mailbox.rst
@@ -202,7 +202,7 @@
.. versionchanged:: 3.2
The file object really is a binary file; previously it was incorrectly
returned in text mode. Also, the file-like object now supports the
- context manager protocol: you can use a :keyword:`with` statement to
+ context management protocol: you can use a :keyword:`with` statement to
automatically close it.
.. note::
diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst
index 471d572..e568e68 100644
--- a/Doc/library/multiprocessing.rst
+++ b/Doc/library/multiprocessing.rst
@@ -1046,7 +1046,7 @@
using :meth:`Connection.send` and :meth:`Connection.recv`.
.. versionadded:: 3.3
- Connection objects now support the context manager protocol -- see
+ Connection objects now support the context management protocol -- see
:ref:`typecontextmanager`. :meth:`~contextmanager.__enter__` returns the
connection object, and :meth:`~contextmanager.__exit__` calls :meth:`close`.
@@ -1503,7 +1503,7 @@
The address used by the manager.
.. versionchanged:: 3.3
- Manager objects support the context manager protocol -- see
+ Manager objects support the context management protocol -- see
:ref:`typecontextmanager`. :meth:`~contextmanager.__enter__` starts the
server process (if it has not already started) and then returns the
manager object. :meth:`~contextmanager.__exit__` calls :meth:`shutdown`.
@@ -1995,7 +1995,7 @@
:meth:`terminate` before using :meth:`join`.
.. versionadded:: 3.3
- Pool objects now support the context manager protocol -- see
+ Pool objects now support the context management protocol -- see
:ref:`typecontextmanager`. :meth:`~contextmanager.__enter__` returns the
pool object, and :meth:`~contextmanager.__exit__` calls :meth:`terminate`.
@@ -2168,7 +2168,7 @@
unavailable then it is ``None``.
.. versionadded:: 3.3
- Listener objects now support the context manager protocol -- see
+ Listener objects now support the context management protocol -- see
:ref:`typecontextmanager`. :meth:`~contextmanager.__enter__` returns the
listener object, and :meth:`~contextmanager.__exit__` calls :meth:`close`.
diff --git a/Doc/library/ossaudiodev.rst b/Doc/library/ossaudiodev.rst
index c57a4d1..bb5081a 100644
--- a/Doc/library/ossaudiodev.rst
+++ b/Doc/library/ossaudiodev.rst
@@ -165,7 +165,7 @@
data written is always equal to the amount of data supplied.
.. versionchanged:: 3.2
- Audio device objects also support the context manager protocol, i.e. they can
+ Audio device objects also support the context management protocol, i.e. they can
be used in a :keyword:`with` statement.
@@ -357,7 +357,7 @@
Returns the file handle number of the open mixer device file.
.. versionchanged:: 3.2
- Mixer objects also support the context manager protocol.
+ Mixer objects also support the context management protocol.
The remaining methods are specific to audio mixing:
diff --git a/Doc/library/tarfile.rst b/Doc/library/tarfile.rst
index 15b88f8..d3956fd 100644
--- a/Doc/library/tarfile.rst
+++ b/Doc/library/tarfile.rst
@@ -238,7 +238,7 @@
:ref:`tar-examples` section for a use case.
.. versionadded:: 3.2
- Added support for the context manager protocol.
+ Added support for the context management protocol.
.. class:: TarFile(name=None, mode='r', fileobj=None, format=DEFAULT_FORMAT, tarinfo=TarInfo, dereference=False, ignore_zeros=False, encoding=ENCODING, errors='surrogateescape', pax_headers=None, debug=0, errorlevel=0)
diff --git a/Doc/library/threading.rst b/Doc/library/threading.rst
index 4a3b3ea..f59ffe5 100644
--- a/Doc/library/threading.rst
+++ b/Doc/library/threading.rst
@@ -354,7 +354,7 @@
immediately. If an attempt is made to release an unlocked lock, a
:exc:`RuntimeError` will be raised.
-Locks also support the :ref:`context manager protocol <with-locks>`.
+Locks also support the :ref:`context management protocol <with-locks>`.
When more than one thread is blocked in :meth:`~Lock.acquire` waiting for the
state to turn to unlocked, only one thread proceeds when a :meth:`~Lock.release`
@@ -433,7 +433,7 @@
:meth:`~Lock.release` of the outermost pair) resets the lock to unlocked and
allows another thread blocked in :meth:`~Lock.acquire` to proceed.
-Reentrant locks also support the :ref:`context manager protocol <with-locks>`.
+Reentrant locks also support the :ref:`context management protocol <with-locks>`.
.. class:: RLock()
@@ -501,7 +501,7 @@
several condition variables must share the same lock. The lock is part of
the condition object: you don't have to track it separately.
-A condition variable obeys the :ref:`context manager protocol <with-locks>`:
+A condition variable obeys the :ref:`context management protocol <with-locks>`:
using the ``with`` statement acquires the associated lock for the duration of
the enclosed block. The :meth:`~Condition.acquire` and
:meth:`~Condition.release` methods also call the corresponding methods of
@@ -677,7 +677,7 @@
finds that it is zero, it blocks, waiting until some other thread calls
:meth:`~Semaphore.release`.
-Semaphores also support the :ref:`context manager protocol <with-locks>`.
+Semaphores also support the :ref:`context management protocol <with-locks>`.
.. class:: Semaphore(value=1)
diff --git a/Doc/whatsnew/2.7.rst b/Doc/whatsnew/2.7.rst
index cbd83da..a622496 100644
--- a/Doc/whatsnew/2.7.rst
+++ b/Doc/whatsnew/2.7.rst
@@ -1612,7 +1612,7 @@
resulting archive. This is more powerful than the existing
*exclude* argument, which has therefore been deprecated.
(Added by Lars Gustäbel; :issue:`6856`.)
- The :class:`~tarfile.TarFile` class also now supports the context manager protocol.
+ The :class:`~tarfile.TarFile` class also now supports the context management protocol.
(Added by Lars Gustäbel; :issue:`7232`.)
* The :meth:`~threading.Event.wait` method of the :class:`threading.Event` class
diff --git a/Doc/whatsnew/3.1.rst b/Doc/whatsnew/3.1.rst
index ab327f5..42c44a0 100644
--- a/Doc/whatsnew/3.1.rst
+++ b/Doc/whatsnew/3.1.rst
@@ -238,7 +238,7 @@
(Contributed by Guilherme Polo; :issue:`2983`.)
* The :class:`gzip.GzipFile` and :class:`bz2.BZ2File` classes now support
- the context manager protocol::
+ the context management protocol::
>>> # Automatically close file after writing
>>> with gzip.GzipFile(filename, "wb") as f:
diff --git a/Doc/whatsnew/3.2.rst b/Doc/whatsnew/3.2.rst
index aa69df2..c4047c5 100644
--- a/Doc/whatsnew/3.2.rst
+++ b/Doc/whatsnew/3.2.rst
@@ -522,7 +522,7 @@
(Proposed and implemented by Mark Dickinson; :issue:`9337`.)
* :class:`memoryview` objects now have a :meth:`~memoryview.release()` method
- and they also now support the context manager protocol. This allows timely
+ and they also now support the context management protocol. This allows timely
release of any resources that were acquired when requesting a buffer from the
original object.
@@ -1315,7 +1315,7 @@
ftp
---
-The :class:`ftplib.FTP` class now supports the context manager protocol to
+The :class:`ftplib.FTP` class now supports the context management protocol to
unconditionally consume :exc:`socket.error` exceptions and to close the FTP
connection when done::
@@ -1595,7 +1595,7 @@
descriptor. The latter can then be reused for other purposes.
(Added by Antoine Pitrou; :issue:`8524`.)
-* :func:`socket.create_connection` now supports the context manager protocol
+* :func:`socket.create_connection` now supports the context management protocol
to unconditionally consume :exc:`socket.error` exceptions and to close the
socket when done.
(Contributed by Giampaolo Rodolà; :issue:`9794`.)
diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst
index cda63e4..32b8581 100644
--- a/Doc/whatsnew/3.3.rst
+++ b/Doc/whatsnew/3.3.rst
@@ -1556,7 +1556,7 @@
nntplib
-------
-The :class:`nntplib.NNTP` class now supports the context manager protocol to
+The :class:`nntplib.NNTP` class now supports the context management protocol to
unconditionally consume :exc:`socket.error` exceptions and to close the NNTP
connection when done::
@@ -1861,7 +1861,7 @@
when creating the outgoing socket. (Contributed by Paulo Scardine in
:issue:`11281`.)
-:class:`~smtplib.SMTP` now supports the context manager protocol, allowing an
+:class:`~smtplib.SMTP` now supports the context management protocol, allowing an
``SMTP`` instance to be used in a ``with`` statement. (Contributed
by Giampaolo Rodolà in :issue:`11289`.)
diff --git a/Doc/whatsnew/3.4.rst b/Doc/whatsnew/3.4.rst
index 177208a..e02e4d2 100644
--- a/Doc/whatsnew/3.4.rst
+++ b/Doc/whatsnew/3.4.rst
@@ -608,7 +608,7 @@
The :meth:`~aifc.aifc.getparams` method now returns a namedtuple rather than a
plain tuple. (Contributed by Claudiu Popa in :issue:`17818`.)
-:func:`aifc.open` now supports the context manager protocol: when used in a
+:func:`aifc.open` now supports the context management protocol: when used in a
:keyword:`with` block, the :meth:`~aifc.aifc.close` method of the returned
object will be called automatically at the end of the block. (Contributed by
Serhiy Storchacha in :issue:`16486`.)
@@ -1521,7 +1521,7 @@
The :meth:`~sunau.getparams` method now returns a namedtuple rather than a
plain tuple. (Contributed by Claudiu Popa in :issue:`18901`.)
-:meth:`sunau.open` now supports the context manager protocol: when used in a
+:meth:`sunau.open` now supports the context management protocol: when used in a
:keyword:`with` block, the ``close`` method of the returned object will be
called automatically at the end of the block. (Contributed by Serhiy Storchaka
in :issue:`18878`.)
@@ -1723,7 +1723,7 @@
The :meth:`~wave.getparams` method now returns a namedtuple rather than a
plain tuple. (Contributed by Claudiu Popa in :issue:`17487`.)
-:meth:`wave.open` now supports the context manager protocol. (Contributed
+:meth:`wave.open` now supports the context management protocol. (Contributed
by Claudiu Popa in :issue:`17616`.)
:mod:`wave` can now :ref:`write output to unseekable files