cpython (merge 2.7 -> 2.7): merge heads
http://hg.python.org/cpython/rev/232c7d73b09d changeset: 74626:232c7d73b09d branch: 2.7 parent: 74625:9133d956b3ce parent: 74622:e2b98a332070 user: Benjamin Peterson <benjamin@python.org> date: Wed Jan 25 16:43:54 2012 -0500 summary: merge heads files: Doc/library/functools.rst | 6 +++--- 1 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 @@ -1,8 +1,8 @@ -:mod:`functools` --- Higher order functions and operations on callable objects +:mod:`functools` --- Higher-order functions and operations on callable objects ============================================================================== .. module:: functools - :synopsis: Higher order functions and operations on callable objects. + :synopsis: Higher-order functions and operations on callable objects. .. moduleauthor:: Peter Harris <scav@blueyonder.co.uk> .. moduleauthor:: Raymond Hettinger <python@rcn.com> .. moduleauthor:: Nick Coghlan <ncoghlan@gmail.com> @@ -29,7 +29,7 @@ tool for programs being converted to Python 3 where comparison functions are no longer supported. - A compare function is any callable that accept two arguments, compares them, + A comparison function is any callable that accept two arguments, compares them, and returns a negative number for less-than, zero for equality, or a positive number for greater-than. A key function is a callable that accepts one argument and returns another value that indicates the position in the desired -- Repository URL: http://hg.python.org/cpython
participants (1)
-
benjamin.peterson