Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2026-03-17 02:10:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

merge from 3.2

Browse source
This commit is contained in:
Georg Brandl 2012-01-23 20:19:46 +01:00
commit 5b45a013bc
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Doc/library/functools.rst
View file

@ -20,7 +20,7 @@ The :mod:`functools` module defines the following functions:
.. function:: cmp_to_key(func)
Transform an old-style comparison function to a key-function. Used with
Transform an old-style comparison function to a key function. Used with
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

2
Doc/library/stdtypes.rst
View file

@ -877,7 +877,7 @@ are sequences of the same type; *n*, *i*, *j* and *k* are integers.
| ``s * n, n * s`` | *n* shallow copies of *s* | \(2) |
| | concatenated | |
+------------------+--------------------------------+----------+
| ``s[i]`` | *i*'th item of *s*, origin 0 | \(3) |
| ``s[i]`` | *i*\ th item of *s*, origin 0 | \(3) |
+------------------+--------------------------------+----------+
| ``s[i:j]`` | slice of *s* from *i* to *j* | (3)(4) |
+------------------+--------------------------------+----------+