From: Georg Brandl Date: Sat, 19 Jul 2008 13:48:44 +0000 (+0000) Subject: Add ordering info for findall and finditer. X-Git-Tag: v2.6b3~272 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b46d6ff279bed9d9452da4bbc6a26319120e5f8e;p=python Add ordering info for findall and finditer. --- diff --git a/Doc/library/re.rst b/Doc/library/re.rst index 05db89d060..c9466aff07 100644 --- a/Doc/library/re.rst +++ b/Doc/library/re.rst @@ -575,10 +575,11 @@ form. .. function:: findall(pattern, string[, flags]) Return all non-overlapping matches of *pattern* in *string*, as a list of - strings. If one or more groups are present in the pattern, return a list of - groups; this will be a list of tuples if the pattern has more than one group. - Empty matches are included in the result unless they touch the beginning of - another match. + strings. The *string* is scanned left-to-right, and matches are returned in + the order found. If one or more groups are present in the pattern, return a + list of groups; this will be a list of tuples if the pattern has more than + one group. Empty matches are included in the result unless they touch the + beginning of another match. .. versionadded:: 1.5.2 @@ -589,8 +590,10 @@ form. .. function:: finditer(pattern, string[, flags]) Return an :term:`iterator` yielding :class:`MatchObject` instances over all - non-overlapping matches for the RE *pattern* in *string*. Empty matches are - included in the result unless they touch the beginning of another match. + non-overlapping matches for the RE *pattern* in *string*. The *string* is + scanned left-to-right, and matches are returned in the order found. Empty + matches are included in the result unless they touch the beginning of another + match. .. versionadded:: 2.2