summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2016-06-04 05:26:40 (GMT)
committerMartin Panter <vadmium+py@gmail.com>2016-06-04 05:26:40 (GMT)
commit19409197e2deaa72649ade73318af16128018c74 (patch)
treecf8c29c532c4345f3af97ccc6ffcc015b91da327
parent5a493e9dc4f83e7e2a67dc38b7d2b886a6ee8960 (diff)
parent3ee6270262627b157bb69169c0fe78855716efdb (diff)
downloadcpython-19409197e2deaa72649ade73318af16128018c74.zip
cpython-19409197e2deaa72649ade73318af16128018c74.tar.gz
cpython-19409197e2deaa72649ade73318af16128018c74.tar.bz2
Merge typo fixes from 3.5
-rw-r--r--Doc/library/asyncio-sync.rst2
-rw-r--r--Doc/library/marshal.rst2
-rw-r--r--Doc/library/urllib.request.rst2
-rw-r--r--Lib/asyncio/locks.py2
-rw-r--r--Misc/NEWS2
-rw-r--r--Python/symtable.c2
6 files changed, 6 insertions, 6 deletions
diff --git a/Doc/library/asyncio-sync.rst b/Doc/library/asyncio-sync.rst
index 1d299ec6..0909352 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 af43944..d9fd68a 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 ac8da26..86f4989 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 1804d7b..842d621 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:
diff --git a/Misc/NEWS b/Misc/NEWS
index 2288bec..21638b5 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -8520,7 +8520,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 558bb06..3f03184 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.