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

Sun Apr 29 12:37:26 CEST 2012

http://hg.python.org/cpython/rev/9165774a8055
changeset: 76628:9165774a8055
parent: 76626:7cc1cddb378d
parent: 76627:23d5b457dc71
user: Ezio Melotti <ezio.melotti at gmail.com>
date: Sun Apr 29 13:37:13 2012 +0300
summary:
 #14236: merge with 3.2.
files:
 Lib/re.py | 2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Lib/re.py b/Lib/re.py
--- a/Lib/re.py
+++ b/Lib/re.py
@@ -73,7 +73,7 @@
 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].
+ \S Matches any non-whitespace character; equivalent to [^\s].
 \w Matches any alphanumeric character; equivalent to [a-zA-Z0-9_]
 in bytes patterns or string patterns with the ASCII flag.
 In string patterns without the ASCII flag, it will match the
-- 
Repository URL: http://hg.python.org/cpython
