(original) (raw)

changeset: 74432:3b097e0892cf parent: 74429:685eacf0dc0c parent: 74431:bff9ab281385 user: Ezio Melotti ezio.melotti@gmail.com date: Mon Jan 16 08:29:42 2012 +0200 files: Doc/library/functools.rst Doc/library/unittest.rst description: #13695: merge with 3.2. diff -r 685eacf0dc0c -r 3b097e0892cf Doc/library/functools.rst --- a/Doc/library/functools.rst Sun Jan 15 22:43:10 2012 -0500 +++ b/Doc/library/functools.rst Mon Jan 16 08:29:42 2012 +0200 @@ -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 -r 685eacf0dc0c -r 3b097e0892cf Doc/library/unittest.rst --- a/Doc/library/unittest.rst Sun Jan 15 22:43:10 2012 -0500 +++ b/Doc/library/unittest.rst Mon Jan 16 08:29:42 2012 +0200 @@ -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`). .. 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/ezio.melotti@gmail.com