[Python-checkins] cpython (merge 3.2 -> default): merge from 3.2

[senthil.kumaran]

http://hg.python.org/cpython/rev/60f2739564f3
changeset:   72374:60f2739564f3
parent:      72371:e25526865339
parent:      72373:bc5b96c92770
user:        Senthil Kumaran <senthil at uthcode.com>
date:        Tue Sep 13 07:14:39 2011 +0800
summary:
  merge from 3.2

files:
  Lib/html/__init__.py |  3 ++-
  1 files changed, 2 insertions(+), 1 deletions(-)


diff --git a/Lib/html/__init__.py b/Lib/html/__init__.py
--- a/Lib/html/__init__.py
+++ b/Lib/html/__init__.py
@@ -13,7 +13,8 @@
     """
     Replace special characters "&", "<" and ">" to HTML-safe sequences.
     If the optional flag quote is true (the default), the quotation mark
-    character (") is also translated.
+    characters, both double quote (") and single quote (') characters are also
+    translated.
     """
     if quote:
         return s.translate(_escape_map_full)

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