From: Eli Bendersky <eliben@gmail.com>
Date: Fri, 11 Nov 2011 19:25:56 +0000 (+0200)
Subject: Issue #12875: explicitly specify default value of the optional 'flags' argument to... 
X-Git-Tag: v2.7.3rc1~309
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a203cedf44c4cfd6dd35871e15086294a4d223b1;p=thirdparty%2FPython%2Fcpython.git

Issue #12875: explicitly specify default value of the optional 'flags' argument to re.* functions. Closes #12875
---

diff --git a/Doc/library/re.rst b/Doc/library/re.rst
index 0b3275756579..eea1f0edde15 100644
--- a/Doc/library/re.rst
+++ b/Doc/library/re.rst
@@ -431,7 +431,7 @@ regular expressions.  Most non-trivial applications always use the compiled
 form.
 
 
-.. function:: compile(pattern[, flags])
+.. function:: compile(pattern[, flags=0])
 
    Compile a regular expression pattern into a regular expression object, which
    can be used for matching using its :func:`match` and :func:`search` methods,
@@ -521,7 +521,7 @@ form.
       b = re.compile(r"\d+\.\d*")
 
 
-.. function:: search(pattern, string[, flags])
+.. function:: search(pattern, string[, flags=0])
 
    Scan through *string* looking for a location where the regular expression
    *pattern* produces a match, and return a corresponding :class:`MatchObject`
@@ -530,7 +530,7 @@ form.
    string.
 
 
-.. function:: match(pattern, string[, flags])
+.. function:: match(pattern, string[, flags=0])
 
    If zero or more characters at the beginning of *string* match the regular
    expression *pattern*, return a corresponding :class:`MatchObject` instance.
@@ -584,7 +584,7 @@ form.
       Added the optional flags argument.
 
 
-.. function:: findall(pattern, string[, flags])
+.. function:: findall(pattern, string[, flags=0])
 
    Return all non-overlapping matches of *pattern* in *string*, as a list of
    strings.  The *string* is scanned left-to-right, and matches are returned in
@@ -599,7 +599,7 @@ form.
       Added the optional flags argument.
 
 
-.. function:: finditer(pattern, string[, flags])
+.. function:: finditer(pattern, string[, flags=0])
 
    Return an :term:`iterator` yielding :class:`MatchObject` instances over all
    non-overlapping matches for the RE *pattern* in *string*.  The *string* is
@@ -613,7 +613,7 @@ form.
       Added the optional flags argument.
 
 
-.. function:: sub(pattern, repl, string[, count, flags])
+.. function:: sub(pattern, repl, string[, count, flags=0])
 
    Return the string obtained by replacing the leftmost non-overlapping occurrences
    of *pattern* in *string* by the replacement *repl*.  If the pattern isn't found,
@@ -662,7 +662,7 @@ form.
       Added the optional flags argument.
 
 
-.. function:: subn(pattern, repl, string[, count, flags])
+.. function:: subn(pattern, repl, string[, count, flags=0])
 
    Perform the same operation as :func:`sub`, but return a tuple ``(new_string,
    number_of_subs_made)``.