diff options
| author | Benjamin Peterson <benjamin@python.org> | 2016-06-03 22:38:37 -0700 |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2016-06-03 22:38:37 -0700 |
| commit | 40cfc1e33b5db067f6ac85b9fa3fc3cbe6b2970b (patch) | |
| tree | a1d4f28b58a708375437c4381d7247406370704c | |
| parent | 3da82067c70c92a5edbf75ec6d44cbc34cd5ad82 (diff) | |
| parent | 3ee6270262627b157bb69169c0fe78855716efdb (diff) | |
| download | cpython-git-40cfc1e33b5db067f6ac85b9fa3fc3cbe6b2970b.tar.gz | |
merge heads
| -rw-r--r-- | Doc/library/asyncio-sync.rst | 2 | ||||
| -rw-r--r-- | Doc/library/marshal.rst | 2 | ||||
| -rw-r--r-- | Doc/library/urllib.request.rst | 2 | ||||
| -rw-r--r-- | Lib/asyncio/locks.py | 2 | ||||
| -rw-r--r-- | Misc/NEWS | 2 | ||||
| -rw-r--r-- | Python/symtable.c | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/Doc/library/asyncio-sync.rst b/Doc/library/asyncio-sync.rst index 1d299ec60a..0909352152 100644 --- a/Doc/library/asyncio-sync.rst +++ b/Doc/library/asyncio-sync.rst @@ -52,7 +52,7 @@ Lock :meth:`acquire` is a coroutine and should be called with ``yield from``. Locks also support the context management protocol. ``(yield from lock)`` - should be used as context manager expression. + should be used as the context manager expression. This class is :ref:`not thread safe <asyncio-multithreading>`. diff --git a/Doc/library/marshal.rst b/Doc/library/marshal.rst index af43944b2c..d9fd68ada9 100644 --- a/Doc/library/marshal.rst +++ b/Doc/library/marshal.rst @@ -40,7 +40,7 @@ this module. The following types are supported: booleans, integers, floating point numbers, complex numbers, strings, bytes, bytearrays, tuples, lists, sets, frozensets, dictionaries, and code objects, where it should be understood that tuples, lists, sets, frozensets and dictionaries are only supported as long as -the values contained therein are themselves supported. +the values contained therein are themselves supported. The singletons :const:`None`, :const:`Ellipsis` and :exc:`StopIteration` can also be marshalled and unmarshalled. For format *version* lower than 3, recursive lists, sets and dictionaries cannot diff --git a/Doc/library/urllib.request.rst b/Doc/library/urllib.request.rst index ac8da26c83..86f4989c1b 100644 --- a/Doc/library/urllib.request.rst +++ b/Doc/library/urllib.request.rst @@ -59,7 +59,7 @@ The :mod:`urllib.request` module defines the following functions: The *cadefault* parameter is ignored. - This function always returns an object which can work as + This function always returns an object which can work as a :term:`context manager` and has methods such as * :meth:`~urllib.response.addinfourl.geturl` --- return the URL of the resource retrieved, diff --git a/Lib/asyncio/locks.py b/Lib/asyncio/locks.py index 1804d7b864..842d6210d5 100644 --- a/Lib/asyncio/locks.py +++ b/Lib/asyncio/locks.py @@ -111,7 +111,7 @@ class Lock(_ContextManagerMixin): acquire() is a coroutine and should be called with 'yield from'. Locks also support the context management protocol. '(yield from lock)' - should be used as context manager expression. + should be used as the context manager expression. Usage: @@ -7778,7 +7778,7 @@ Library - Issue #16176: Properly identify Windows 8 via platform.platform() - Issue #16088: BaseHTTPRequestHandler's send_error method includes a - Content-Length header in it's response now. Patch by Antoine Pitrou. + Content-Length header in its response now. Patch by Antoine Pitrou. - Issue #16114: The subprocess module no longer provides a misleading error message stating that args[0] did not exist when either the cwd or executable diff --git a/Python/symtable.c b/Python/symtable.c index 6d1a62b782..1591a20f50 100644 --- a/Python/symtable.c +++ b/Python/symtable.c @@ -854,7 +854,7 @@ analyze_child_block(PySTEntryObject *entry, PyObject *bound, PyObject *free, /* Copy the bound and global dictionaries. - These dictionary are used by all blocks enclosed by the + These dictionaries are used by all blocks enclosed by the current block. The analyze_block() call modifies these dictionaries. |