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

[ezio.melotti]

http://hg.python.org/cpython/rev/db39b9513e71
changeset:   76616:db39b9513e71
parent:      76614:64a6824d129d
parent:      76615:da9179248118
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sun Apr 29 08:24:02 2012 +0300
summary:
  #14236: merge with 3.2.

files:
  Lib/re.py |  5 ++++-
  1 files changed, 4 insertions(+), 1 deletions(-)


diff --git a/Lib/re.py b/Lib/re.py
--- a/Lib/re.py
+++ b/Lib/re.py
@@ -69,7 +69,10 @@
              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.

-- 
Repository URL: http://hg.python.org/cpython