summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2012-01-16 06:29:42 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2012-01-16 06:29:42 (GMT)
commit37c7a065ceeecacb3c54de72ed75a3bbae34d925 (patch)
treeac764445780f06e7ef1eebf2223c6a7192cb2a2d /Doc
parent6f5b6d7e8f8aa5ed94dea62a7fd1df57b8fd713d (diff)
parent9ecb6beb8c96825c33ca29d34e02b6e80b0b3f52 (diff)
downloadcpython-37c7a065ceeecacb3c54de72ed75a3bbae34d925.zip
cpython-37c7a065ceeecacb3c54de72ed75a3bbae34d925.tar.gz
cpython-37c7a065ceeecacb3c54de72ed75a3bbae34d925.tar.bz2
#13695: merge with 3.2.
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/functools.rst2
-rw-r--r--Doc/library/unittest.rst4
2 files changed, 3 insertions, 3 deletions
diff --git a/Doc/library/functools.rst b/Doc/library/functools.rst
index 4eaf54e..e5f95ec 100644
--- a/Doc/library/functools.rst
+++ b/Doc/library/functools.rst
@@ -24,7 +24,7 @@ The :mod:`functools` module defines the following functions:
tools that accept key functions (such as :func:`sorted`, :func:`min`,
:func:`max`, :func:`heapq.nlargest`, :func:`heapq.nsmallest`,
:func:`itertools.groupby`). This function is primarily used as a transition
- tool for programs being converted from Py2.x which supported the use of
+ tool for programs being converted from Python 2 which supported the use of
comparison functions.
A compare function is any callable that accept two arguments, compares them,
diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst
index 520f2e8..0798cf1 100644
--- a/Doc/library/unittest.rst
+++ b/Doc/library/unittest.rst
@@ -873,13 +873,13 @@ Test cases
In addition, if *first* and *second* are the exact same type and one of
list, tuple, dict, set, frozenset or str or any type that a subclass
- registers with :meth:`addTypeEqualityFunc` the type specific equality
+ registers with :meth:`addTypeEqualityFunc` the type-specific equality
function will be called in order to generate a more useful default
error message (see also the :ref:`list of type-specific methods
<type-specific-methods>`).
.. versionchanged:: 3.1
- Added the automatic calling of type specific equality function.
+ Added the automatic calling of type-specific equality function.
.. versionchanged:: 3.2
:meth:`assertMultiLineEqual` added as the default type equality