diff options
Diffstat (limited to 'Doc/lib')
| -rw-r--r-- | Doc/lib/libfuncs.tex | 9 | ||||
| -rw-r--r-- | Doc/lib/libitertools.tex | 2 | ||||
| -rw-r--r-- | Doc/lib/libstdtypes.tex | 13 |
3 files changed, 13 insertions, 11 deletions
diff --git a/Doc/lib/libfuncs.tex b/Doc/lib/libfuncs.tex index dc9f344..99c586b 100644 --- a/Doc/lib/libfuncs.tex +++ b/Doc/lib/libfuncs.tex @@ -886,6 +886,15 @@ class C(object): \samp{a[start:stop, i]}. \end{funcdesc} +\begin{funcdesc}{sorted(\var{iterable}\optional{, \var{cmp}=None + \optional{, \var{key}=None + \optional{, \var{reverse}=False}}})} + Return a new sorted list from the items in \var{iterable}. + The optional arguments \var{cmp}, \var{key}, and \var{reverse} + have the same meaning as those for the \method{list.sort()} method. + \versionadded{2.4} +\end{funcdesc} + \begin{funcdesc}{staticmethod}{function} Return a static method for \var{function}. diff --git a/Doc/lib/libitertools.tex b/Doc/lib/libitertools.tex index 59fb185..a85e048 100644 --- a/Doc/lib/libitertools.tex +++ b/Doc/lib/libitertools.tex @@ -398,7 +398,7 @@ Samuele # Show a dictionary sorted and grouped by value >>> from operator import itemgetter >>> d = dict(a=1, b=2, c=1, d=2, e=1, f=2, g=3) ->>> di = list.sorted(d.iteritems(), key=itemgetter(1)) +>>> di = sorted(d.iteritems(), key=itemgetter(1)) >>> for k, g in groupby(di, key=itemgetter(1)): ... print k, map(itemgetter(0), g) ... diff --git a/Doc/lib/libstdtypes.tex b/Doc/lib/libstdtypes.tex index 8b6b194..6e38222 100644 --- a/Doc/lib/libstdtypes.tex +++ b/Doc/lib/libstdtypes.tex @@ -988,9 +988,6 @@ The following operations are defined on mutable sequence types (where \lineiii{\var{s}.sort(\optional{\var{cmp}=None\optional{, \var{key}=None \optional{, \var{reverse}=False}}})} {sort the items of \var{s} in place}{(7), (8), (9), (10)} - \lineiii{\var{s}.sorted(\var{iterable}\optional{, \var{cmp}=None\optional{, \var{key}=None - \optional{, \var{reverse}=False}}})} - {return a new sorted list from the items in \var{iterable}}{(8), (9), (11)} \end{tableiii} \indexiv{operations on}{mutable}{sequence}{types} \indexiii{operations on}{sequence}{types} @@ -1040,8 +1037,8 @@ Notes: list. To remind you that they operate by side effect, they don't return the sorted or reversed list. -\item[(8)] The \method{sort()} and \method{sorted()} methods take optional - arguments for controlling the comparisons. +\item[(8)] The \method{sort()} method takes optional arguments for + controlling the comparisions. \var{cmp} specifies a custom comparison function of two arguments (list items) which should return a negative, zero or positive number @@ -1068,8 +1065,7 @@ Notes: \versionchanged[Support for \var{key} and \var{reverse} was added]{2.4} \item[(9)] Starting with Python 2.3, the \method{sort()} method is - guaranteed to be stable. Starting with Python 2.4, the \method{sorted()} - method is also guaranteed to be stable. A sort is stable if it does not + guaranteed to be stable. A sort is stable if it guarantees not to change the relative order of elements that compare equal --- this is helpful for sorting in multiple passes (for example, sort by department, then by salary grade). @@ -1079,9 +1075,6 @@ Notes: of Python 2.3 makes the list appear empty for the duration, and raises \exception{ValueError} if it can detect that the list has been mutated during a sort. - -\item[(11)] \method{sorted()} is a class method that returns a new list. - \versionadded{2.4} \end{description} \subsection{Set Types \label{types-set}} |