merge with 3.2

This commit is contained in:
Georg Brandl 2012-01-25 22:36:43 +01:00
commit b0f30c9891
1 changed files with 3 additions and 3 deletions

View File

@ -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 .. 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:: Peter Harris <scav@blueyonder.co.uk>
.. moduleauthor:: Raymond Hettinger <python@rcn.com> .. moduleauthor:: Raymond Hettinger <python@rcn.com>
.. moduleauthor:: Nick Coghlan <ncoghlan@gmail.com> .. moduleauthor:: Nick Coghlan <ncoghlan@gmail.com>
@ -27,7 +27,7 @@ The :mod:`functools` module defines the following functions:
tool for programs being converted from Python 2 which supported the use of tool for programs being converted from Python 2 which supported the use of
comparison functions. comparison functions.
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 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 number for greater-than. A key function is a callable that accepts one
argument and returns another value indicating the position in the desired argument and returns another value indicating the position in the desired