Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Replace criterium with criterion. Fixes #705120.

This commit is contained in:
Martin v. Löwis 2003-03-27 16:59:38 +00:00
parent 0e85e7a636
commit 3ae0f7a7cf
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Doc/lib/libimaplib.tex
View File

@ -274,12 +274,12 @@ An \class{IMAP4} instance has the following methods:
\code{None}. Returns the given code, instead of the usual type.
\end{methoddesc}
\begin{methoddesc}{search}{charset, criterium\optional{, ...}}
\begin{methoddesc}{search}{charset, criterion\optional{, ...}}
Search mailbox for matching messages. Returned data contains a space
separated list of matching message numbers. \var{charset} may be
\code{None}, in which case no \samp{CHARSET} will be specified in the
request to the server. The IMAP protocol requires that at least one
criterium be specified; an exception will be raised when the server
criterion be specified; an exception will be raised when the server
returns an error.
Example:
@ -325,12 +325,12 @@ msgnums = M.search(None, '(FROM "LDJ")')
Returns socket instance used to connect to server.
\end{methoddesc}
\begin{methoddesc}{sort}{sort_criteria, charset, search_criterium\optional{, ...}}
\begin{methoddesc}{sort}{sort_criteria, charset, search_criterion\optional{, ...}}
The \code{sort} command is a variant of \code{search} with sorting semantics for
the results. Returned data contains a space
separated list of matching message numbers.
Sort has two arguments before the \var{search_criterium}
Sort has two arguments before the \var{search_criterion}
argument(s); a parenthesized list of \var{sort_criteria}, and the searching \var{charset}.
Note that unlike \code{search}, the searching \var{charset} argument is mandatory.
There is also a \code{uid sort} command which corresponds to \code{sort} the way

2
Lib/imaplib.py
View File

@ -573,7 +573,7 @@ class IMAP4:
def search(self, charset, *criteria):
"""Search mailbox for matching messages.
(typ, [data]) = <instance>.search(charset, criterium, ...)
(typ, [data]) = <instance>.search(charset, criterion, ...)
'data' is space separated list of matching message numbers.
"""