summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2012-04-29 05:24:02 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2012-04-29 05:24:02 (GMT)
commit660a94972000675b4c2be3e8485cac319476f228 (patch)
tree3cbf8afb795d7a1c468da6ca1aa7fec45fab9a72 /Lib
parent1aacba497bfb816d16dc39c09cae3ae17d6d74a2 (diff)
parente990092fd0e17f79f282f4009ce1676bfde09ab4 (diff)
downloadcpython-660a94972000675b4c2be3e8485cac319476f228.zip
cpython-660a94972000675b4c2be3e8485cac319476f228.tar.gz
cpython-660a94972000675b4c2be3e8485cac319476f228.tar.bz2
#14236: merge with 3.2.
Diffstat (limited to 'Lib')
-rw-r--r--Lib/re.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/Lib/re.py b/Lib/re.py
index 9195e0a..69bd1c7 100644
--- a/Lib/re.py
+++ b/Lib/re.py
@@ -69,7 +69,10 @@ resulting RE will match the second character.
In string patterns without the ASCII flag, it will match the whole
range of Unicode digits.
\D Matches any non-digit character; equivalent to [^\d].
- \s Matches any whitespace character; equivalent to [ \t\n\r\f\v].
+ \s Matches any whitespace character; equivalent to [ \t\n\r\f\v] in
+ bytes patterns or string patterns with the ASCII flag.
+ In string patterns without the ASCII flag, it will match the whole
+ range of Unicode whitespace characters.
\S Matches any non-whitespace character; equiv. to [^ \t\n\r\f\v].
\w Matches any alphanumeric character; equivalent to [a-zA-Z0-9_]
in bytes patterns or string patterns with the ASCII flag.