[Python-checkins] cpython (merge 3.5 -> default): Merge 3.5

[yury.selivanov]

https://hg.python.org/cpython/rev/1c94ab9c5ecf
changeset:   97910:1c94ab9c5ecf
parent:      97908:f7725d83cdb6
parent:      97909:1639f5c1ac87
user:        Yury Selivanov <yselivanov at sprymix.com>
date:        Fri Sep 11 01:23:31 2015 -0400
summary:
  Merge 3.5

files:
  Doc/whatsnew/3.5.rst |  16 ++++++++--------
  1 files changed, 8 insertions(+), 8 deletions(-)


diff --git a/Doc/whatsnew/3.5.rst b/Doc/whatsnew/3.5.rst
--- a/Doc/whatsnew/3.5.rst
+++ b/Doc/whatsnew/3.5.rst
@@ -678,8 +678,8 @@
 makes it 4 to 100 times faster.  (Contributed by Eric Snow in :issue:`16991`.)
 
 :meth:`OrderedDict.items <collections.OrderedDict.items>`,
-:meth:`OrderedDict.items <collections.OrderedDict.keys>`,
-:meth:`OrderedDict.items <collections.OrderedDict.values>` views now support
+:meth:`OrderedDict.keys <collections.OrderedDict.keys>`,
+:meth:`OrderedDict.values <collections.OrderedDict.values>` views now support
 :func:`reversed` iteration.
 (Contributed by Serhiy Storchaka in :issue:`19505`.)
 
@@ -991,7 +991,7 @@
 network objects from existing addresses.  (Contributed by Peter Moody
 and Antoine Pitrou in :issue:`16531`.)
 
-New :attr:`~ipaddress.IPv4Network.reverse_pointer>` attribute for
+A new :attr:`~ipaddress.IPv4Network.reverse_pointer>` attribute for
 :class:`~ipaddress.IPv4Network` and :class:`~ipaddress.IPv6Network` classes
 returns the name of the reverse DNS PTR record.
 (Contributed by Leon Weber in :issue:`20480`.)
@@ -1450,7 +1450,7 @@
 timeit
 ------
 
-New command line option ``-u`` or ``--unit=U`` can be used to specify the time
+A new command line option ``-u`` or ``--unit=U`` can be used to specify the time
 unit for the timer output.  Supported options are ``usec``, ``msec``,
 or ``sec``.  (Contributed by Julian Gindi in :issue:`18983`.)
 
@@ -1535,7 +1535,7 @@
 unittest
 --------
 
-New command line option ``--locals`` to show local variables in
+A new command line option ``--locals`` to show local variables in
 tracebacks.  (Contributed by Robert Collins in :issue:`22936`.)
 
 
@@ -1693,15 +1693,15 @@
 
 (Contributed by Victor Stinner in :issue:`18395`.)
 
-New :c:func:`PyCodec_NameReplaceErrors` function to replace the unicode
+A new :c:func:`PyCodec_NameReplaceErrors` function to replace the unicode
 encode error with ``\N{...}`` escapes.
 (Contributed by Serhiy Storchaka in :issue:`19676`.)
 
-New :c:func:`PyErr_FormatV` similar to :c:func:`PyErr_Format`,
+A new :c:func:`PyErr_FormatV` function similar to :c:func:`PyErr_Format`,
 but accepts a ``va_list`` argument.
 (Contributed by Antoine Pitrou in :issue:`18711`.)
 
-New :c:data:`PyExc_RecursionError` exception.
+A new :c:data:`PyExc_RecursionError` exception.
 (Contributed by Georg Brandl in :issue:`19235`.)
 
 New :c:func:`PyModule_FromDefAndSpec`, :c:func:`PyModule_FromDefAndSpec2`,

-- 
Repository URL: https://hg.python.org/cpython