Kaydet (Commit) 828a0bdb authored tarafından Guido van Rossum's avatar Guido van Rossum

count() now has a 4th parameter too. Also rephrased the docs for find

to use the same, better words to explain start/end.
üst 871cf161
...@@ -110,14 +110,11 @@ sequences. ...@@ -110,14 +110,11 @@ sequences.
\end{funcdesc} \end{funcdesc}
\begin{funcdesc}{find}{s\, sub\optional{\, start\optional{\,end}}} \begin{funcdesc}{find}{s\, sub\optional{\, start\optional{\,end}}}
Return the lowest index in \var{s} not smaller than \var{start} and not Return the lowest index in \var{s} where the substring \var{sub} is
greater than \var{end} where the substring \var{sub} is found. Return found such that \var{sub} is wholly contained in
\code{-1} when \var{sub} does not occur as a substring of \var{s} with \code{\var{s}[\var{start}:\var{end}]}. Return -1 on failure.
index at least \var{start} and less than \var{end}. Defaults for \var{start} and \var{end} and interpretation of negative
If \var{start} is omitted, it defaults to \code{0}. If \var{start} is values is the same as for slices.
negative, \code{len(\var{s})} is added.
If \var{end} is omitted, it defaults to \code{len(\var{s})}. If
\var{end} is negative, \code{len(\var{s})} is added.
\end{funcdesc} \end{funcdesc}
\begin{funcdesc}{rfind}{s\, sub\optional{\, start\optional{\,end}}} \begin{funcdesc}{rfind}{s\, sub\optional{\, start\optional{\,end}}}
...@@ -134,11 +131,11 @@ Like \code{rfind} but raise \code{ValueError} when the substring is ...@@ -134,11 +131,11 @@ Like \code{rfind} but raise \code{ValueError} when the substring is
not found. not found.
\end{funcdesc} \end{funcdesc}
\begin{funcdesc}{count}{s\, sub\optional{\, start}} \begin{funcdesc}{count}{s\, sub\optional{\, start\optional{\,end}}}
Return the number of (non-overlapping) occurrences of substring Return the number of (non-overlapping) occurrences of substring
\var{sub} in string \var{s} with index at least \var{start}. \var{sub} in string \code{\var{s}[\var{start}:\var{end}]}.
If \var{start} is omitted, it defaults to \code{0}. If \var{start} is Defaults for \var{start} and \var{end} and interpretation of negative
negative, \code{len(\var{s})} is added. values is the same as for slices.
\end{funcdesc} \end{funcdesc}
\begin{funcdesc}{lower}{s} \begin{funcdesc}{lower}{s}
......
...@@ -110,14 +110,11 @@ sequences. ...@@ -110,14 +110,11 @@ sequences.
\end{funcdesc} \end{funcdesc}
\begin{funcdesc}{find}{s\, sub\optional{\, start\optional{\,end}}} \begin{funcdesc}{find}{s\, sub\optional{\, start\optional{\,end}}}
Return the lowest index in \var{s} not smaller than \var{start} and not Return the lowest index in \var{s} where the substring \var{sub} is
greater than \var{end} where the substring \var{sub} is found. Return found such that \var{sub} is wholly contained in
\code{-1} when \var{sub} does not occur as a substring of \var{s} with \code{\var{s}[\var{start}:\var{end}]}. Return -1 on failure.
index at least \var{start} and less than \var{end}. Defaults for \var{start} and \var{end} and interpretation of negative
If \var{start} is omitted, it defaults to \code{0}. If \var{start} is values is the same as for slices.
negative, \code{len(\var{s})} is added.
If \var{end} is omitted, it defaults to \code{len(\var{s})}. If
\var{end} is negative, \code{len(\var{s})} is added.
\end{funcdesc} \end{funcdesc}
\begin{funcdesc}{rfind}{s\, sub\optional{\, start\optional{\,end}}} \begin{funcdesc}{rfind}{s\, sub\optional{\, start\optional{\,end}}}
...@@ -134,11 +131,11 @@ Like \code{rfind} but raise \code{ValueError} when the substring is ...@@ -134,11 +131,11 @@ Like \code{rfind} but raise \code{ValueError} when the substring is
not found. not found.
\end{funcdesc} \end{funcdesc}
\begin{funcdesc}{count}{s\, sub\optional{\, start}} \begin{funcdesc}{count}{s\, sub\optional{\, start\optional{\,end}}}
Return the number of (non-overlapping) occurrences of substring Return the number of (non-overlapping) occurrences of substring
\var{sub} in string \var{s} with index at least \var{start}. \var{sub} in string \code{\var{s}[\var{start}:\var{end}]}.
If \var{start} is omitted, it defaults to \code{0}. If \var{start} is Defaults for \var{start} and \var{end} and interpretation of negative
negative, \code{len(\var{s})} is added. values is the same as for slices.
\end{funcdesc} \end{funcdesc}
\begin{funcdesc}{lower}{s} \begin{funcdesc}{lower}{s}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment