diff options
| author | Georg Brandl <georg@python.org> | 2012-03-17 16:29:39 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2012-03-17 16:29:39 (GMT) |
| commit | 869ac7895f0cadb714bb2bd1c601d06b03102010 (patch) | |
| tree | 7510abc34236df96848df59d61b054142bc20484 | |
| parent | 9758fcfb878e656ff266a36aaae92a9f6d2aebf9 (diff) | |
| parent | 3a19e542ff9b9c5ed1198148cd171583a6973028 (diff) | |
| download | cpython-869ac7895f0cadb714bb2bd1c601d06b03102010.zip cpython-869ac7895f0cadb714bb2bd1c601d06b03102010.tar.gz cpython-869ac7895f0cadb714bb2bd1c601d06b03102010.tar.bz2 | |
merge with 3.2
| -rw-r--r-- | Doc/library/re.rst | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Doc/library/re.rst b/Doc/library/re.rst index abbe152..79b8d3b 100644 --- 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 |