[Python-checkins] cpython (3.4): Issue #22369: Change "context manager protocol" to "context management
serhiy.storchaka
python-checkins at python.org
Wed Sep 10 22:59:49 CEST 2014
http://hg.python.org/cpython/rev/cc5b183a2ad4
changeset: 92384:cc5b183a2ad4
branch: 3.4
parent: 92380:2b3dbbd2bd92
user: Serhiy Storchaka <storchaka at gmail.com>
date: Wed Sep 10 23:43:41 2014 +0300
summary:
Issue #22369: Change "context manager protocol" to "context management protocol".
files:
Doc/library/asyncio-sync.rst | 4 ++--
Doc/library/mailbox.rst | 2 +-
Doc/library/multiprocessing.rst | 8 ++++----
Doc/library/ossaudiodev.rst | 4 ++--
Doc/library/tarfile.rst | 2 +-
Doc/library/threading.rst | 8 ++++----
Doc/whatsnew/2.7.rst | 2 +-
Doc/whatsnew/3.1.rst | 2 +-
Doc/whatsnew/3.2.rst | 6 +++---
Doc/whatsnew/3.3.rst | 4 ++--
Doc/whatsnew/3.4.rst | 6 +++---
Lib/asyncio/locks.py | 4 ++--
Lib/mailbox.py | 2 +-
Misc/HISTORY | 18 +++++++++---------
Misc/NEWS | 6 +++---
Modules/ossaudiodev.c | 4 ++--
16 files changed, 41 insertions(+), 41 deletions(-)
diff --git a/Doc/library/asyncio-sync.rst b/Doc/library/asyncio-sync.rst
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
diff --git a/Lib/asyncio/locks.py b/Lib/asyncio/locks.py
--- a/Lib/asyncio/locks.py
+++ b/Lib/asyncio/locks.py
@@ -63,7 +63,7 @@
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:
@@ -376,7 +376,7 @@
can never go below zero; when acquire() finds that it is zero, it blocks,
waiting until some other thread calls 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,
diff --git a/Lib/mailbox.py b/Lib/mailbox.py
--- a/Lib/mailbox.py
+++ b/Lib/mailbox.py
@@ -1980,7 +1980,7 @@
return result
def __enter__(self):
- """Context manager protocol support."""
+ """Context management protocol support."""
return self
def __exit__(self, *exc):
diff --git a/Misc/HISTORY b/Misc/HISTORY
--- a/Misc/HISTORY
+++ b/Misc/HISTORY
@@ -811,7 +811,7 @@
- Issue #14772: Return destination values from some shutil functions.
-- Issue #15064: Implement context manager protocol for multiprocessing types
+- Issue #15064: Implement context management protocol for multiprocessing types
- Issue #15101: Make pool finalizer avoid joining current thread.
@@ -3606,7 +3606,7 @@
``mmap.PROT_READ|mmap.PROT_EXEC`` would segfault instead of raising a
TypeError. Patch by Charles-François Natali.
-- Issue #9795: add context manager protocol support for nntplib.NNTP class.
+- Issue #9795: add context management protocol support for nntplib.NNTP class.
- Issue #11306: mailbox in certain cases adapts to an inability to open
certain files in read-write mode. Previously it detected this by
@@ -4804,7 +4804,7 @@
- Issue #1486713: HTMLParser now has an optional tolerant mode where it tries to
guess at the correct parsing of invalid html.
-- Issue #10554: Add context manager support to subprocess.Popen objects.
+- Issue #10554: Add context management protocol support to subprocess.Popen objects.
- Issue #8989: email.utils.make_msgid now has a domain parameter that can
override the domain name used in the generated msgid.
@@ -5166,7 +5166,7 @@
- Issue #10253: FileIO leaks a file descriptor when trying to open a file for
append that isn't seekable. Patch by Brian Brazil.
-- Support context manager protocol for file-like objects returned by mailbox
+- Support context management protocol for file-like objects returned by mailbox
``get_file()`` methods.
- Issue #10246: uu.encode didn't close file objects explicitly when filenames
@@ -5300,7 +5300,7 @@
- Issue #10143: Update "os.pathconf" values.
-- Issue #6518: Support context manager protcol for ossaudiodev types.
+- Issue #6518: Support context management protocol for ossaudiodev types.
- Issue #678250: Make mmap flush a noop on ACCESS_READ and ACCESS_COPY.
@@ -5909,7 +5909,7 @@
- Issue #8105: Validate file descriptor passed to mmap.mmap on Windows.
-- Issue #8046: Add context manager protocol support and .closed property to mmap
+- Issue #8046: Add context management protocol support and .closed property to mmap
objects.
Library
@@ -6916,7 +6916,7 @@
- The audioop module now supports sound fragments of length greater than 2**31
bytes on 64-bit machines, and is PY_SSIZE_T_CLEAN.
-- Issue #4972: Add support for the context manager protocol to the ftplib.FTP
+- Issue #4972: Add support for the context management protocol to the ftplib.FTP
class.
- Issue #8664: In py_compile, create __pycache__ when the compiled path is
@@ -7204,7 +7204,7 @@
- Issue #7494: fix a crash in _lsprof (cProfile) after clearing the profiler,
reset also the pointer to the current pointer context.
-- Issue #7232: Add support for the context manager protocol to the TarFile
+- Issue #7232: Add support for the context management protocol to the TarFile
class.
- Issue #7250: Fix info leak of os.environ across multi-run uses of
@@ -9242,7 +9242,7 @@
- Issue #1696199: Add collections.Counter() for rapid and convenient
counting.
-- Issue #3860: GzipFile and BZ2File now support the context manager protocol.
+- Issue #3860: GzipFile and BZ2File now support the context management protocol.
- Issue #4867: Fixed a crash in ctypes when passing a string to a
function without defining argtypes.
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -1958,7 +1958,7 @@
- Issue #19448: Add private API to SSL module to lookup ASN.1 objects by OID,
NID, short name and long name.
-- Issue #19282: dbm.open now supports the context manager protocol. (Inital
+- Issue #19282: dbm.open now supports the context management protocol. (Inital
patch by Claudiu Popa)
- Issue #8311: Added support for writing any bytes-like objects in the aifc,
@@ -2667,7 +2667,7 @@
- Issue #18830: inspect.getclasstree() no longer produces duplicate entries even
when input list contains duplicates.
-- Issue #18878: sunau.open now supports the context manager protocol. Based on
+- Issue #18878: sunau.open now supports the context management protocol. Based on
patches by Claudiu Popa and R. David Murray.
- Issue #18909: Fix _tkinter.tkapp.interpaddr() on Windows 64-bit, don't cast
@@ -3307,7 +3307,7 @@
initialization, so as to reclaim allocated resources (Python callbacks)
at shutdown. Original patch by Robin Schreiber.
-- Issue #17616: wave.open now supports the context manager protocol.
+- Issue #17616: wave.open now supports the context management protocol.
- Issue #18599: Fix name attribute of _sha1.sha1() object. It now returns
'SHA1' instead of 'SHA'.
diff --git a/Modules/ossaudiodev.c b/Modules/ossaudiodev.c
--- a/Modules/ossaudiodev.c
+++ b/Modules/ossaudiodev.c
@@ -894,7 +894,7 @@
/* Aliases for backwards compatibility */
{ "flush", (PyCFunction)oss_sync, METH_VARARGS },
- /* Support for the context manager protocol */
+ /* Support for the context management protocol */
{ "__enter__", oss_self, METH_NOARGS },
{ "__exit__", oss_exit, METH_VARARGS },
@@ -906,7 +906,7 @@
{ "close", (PyCFunction)oss_mixer_close, METH_NOARGS },
{ "fileno", (PyCFunction)oss_mixer_fileno, METH_NOARGS },
- /* Support for the context manager protocol */
+ /* Support for the context management protocol */
{ "__enter__", oss_self, METH_NOARGS },
{ "__exit__", oss_exit, METH_VARARGS },
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list