merge with 3.2

869ac789 · Georg Brandl · 9758fcfb · 3a19e542 · 869ac789
Kaydet (Commit) 869ac789 authored Mar 17, 2012 tarafından Georg Brandl
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

re.rst Doc/library/re.rst +3 -2

No files found.
--- a/Doc/library/re.rst
+++ b/Doc/library/re.rst
@@ -787,8 +787,9 @@ attributes:

 .. 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