[Python-checkins] cpython (merge 3.2 -> default): merge with 3.2

[georg.brandl]

http://hg.python.org/cpython/rev/84fb54c27a9c
changeset:   75790:84fb54c27a9c
parent:      75786:64e1eeca4cb7
parent:      75789:b3b3a4a7d7b2
user:        Georg Brandl <georg at python.org>
date:        Sat Mar 17 17:29:39 2012 +0100
summary:
  merge with 3.2

files:
  Doc/library/re.rst |  5 +++--
  1 files changed, 3 insertions(+), 2 deletions(-)


diff --git a/Doc/library/re.rst b/Doc/library/re.rst
--- a/Doc/library/re.rst
+++ b/Doc/library/re.rst
@@ -787,8 +787,9 @@
 
 .. attribute:: regex.flags
 
-   The flags argument used when the RE object was compiled, or ``0`` if no flags
-   were provided.
+   The regex matching flags.  This is a combination of the flags given to
+   :func:`.compile`, any ``(?...)`` inline flags in the pattern, and implicit
+   flags such as :data:`UNICODE` if the pattern is a Unicode string.
 
 
 .. attribute:: regex.groups

-- 
Repository URL: http://hg.python.org/cpython