merge 3.2

This commit is contained in:
Benjamin Peterson 2011-12-19 16:42:28 -05:00
commit 3563b18c19

View file

@ -12,11 +12,11 @@
from operator import itemgetter, iadd from operator import itemgetter, iadd
The :mod:`operator` module exports a set of functions implemented in C The :mod:`operator` module exports a set of functions corresponding to the
corresponding to the intrinsic operators of Python. For example, intrinsic operators of Python. For example, ``operator.add(x, y)`` is
``operator.add(x, y)`` is equivalent to the expression ``x+y``. The function equivalent to the expression ``x+y``. The function names are those used for
names are those used for special class methods; variants without leading and special class methods; variants without leading and trailing ``__`` are also
trailing ``__`` are also provided for convenience. provided for convenience.
The functions fall into categories that perform object comparisons, logical The functions fall into categories that perform object comparisons, logical
operations, mathematical operations and sequence operations. operations, mathematical operations and sequence operations.