[Python-checkins] cpython (merge 3.2 -> default): #13695: merge with 3.2.

[ezio.melotti]

http://hg.python.org/cpython/rev/3b097e0892cf
changeset:   74432:3b097e0892cf
parent:      74429:685eacf0dc0c
parent:      74431:bff9ab281385
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Mon Jan 16 08:29:42 2012 +0200
summary:
  #13695: merge with 3.2.

files:
  Doc/library/functools.rst |  2 +-
  Doc/library/unittest.rst  |  4 ++--
  2 files changed, 3 insertions(+), 3 deletions(-)


diff --git a/Doc/library/functools.rst b/Doc/library/functools.rst
--- a/Doc/library/functools.rst
+++ b/Doc/library/functools.rst
@@ -24,7 +24,7 @@
    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
--- a/Doc/library/unittest.rst
+++ b/Doc/library/unittest.rst
@@ -873,13 +873,13 @@
 
       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

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