diff options
| author | Georg Brandl <georg@python.org> | 2009-08-13 07:56:35 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2009-08-13 07:56:35 (GMT) |
| commit | 1b5ab457f2d5541657d3bb618478853e2001eeb8 (patch) | |
| tree | 3fd9225624a42c6e4ef764c8f3f8e218f61782f7 /Doc/library/re.rst | |
| parent | d07ac6402422abbc54215478e042bbb009148cf9 (diff) | |
| download | cpython-1b5ab457f2d5541657d3bb618478853e2001eeb8.zip cpython-1b5ab457f2d5541657d3bb618478853e2001eeb8.tar.gz cpython-1b5ab457f2d5541657d3bb618478853e2001eeb8.tar.bz2 | |
Merged revisions 74328,74332-74333,74365 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r74328 | georg.brandl | 2009-08-06 17:06:25 +0200 (Do, 06 Aug 2009) | 1 line
Fix base keyword arg name for int() and long().
........
r74332 | georg.brandl | 2009-08-06 19:23:21 +0200 (Do, 06 Aug 2009) | 1 line
Fix punctuation and one copy-paste error.
........
r74333 | georg.brandl | 2009-08-06 19:43:55 +0200 (Do, 06 Aug 2009) | 1 line
#6658: fix two typos.
........
r74365 | georg.brandl | 2009-08-13 09:48:05 +0200 (Do, 13 Aug 2009) | 1 line
#6679: Remove mention that sub supports no flags.
........
Diffstat (limited to 'Doc/library/re.rst')
| -rw-r--r-- | Doc/library/re.rst | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/Doc/library/re.rst b/Doc/library/re.rst index cdb9951..ea6563b 100644 --- a/Doc/library/re.rst +++ b/Doc/library/re.rst @@ -656,9 +656,7 @@ form. >>> re.sub(r'\sAND\s', ' & ', 'Baked Beans And Spam', flags=re.IGNORECASE) 'Baked Beans & Spam' - The pattern may be a string or an RE object; if you need to specify regular - expression flags, you must use a RE object, or use embedded modifiers in a - pattern; for example, ``sub("(?i)b+", "x", "bbbb BBBB")`` returns ``'x x'``. + The pattern may be a string or an RE object. The optional argument *count* is the maximum number of pattern occurrences to be replaced; *count* must be a non-negative integer. If omitted or zero, all |