merge with 3.2

This commit is contained in:
Georg Brandl 2012-03-17 17:29:39 +01:00
commit 869ac7895f

View File

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