Add apostrophes to xhtml_escape.

Closes #833.

diff --git a/tornado/escape.py b/tornado/escape.py
index 91c3e7408ca8284ac4e68e0b6ae019e970120c8a..4e2d20d75452843e557f9aeddf380c0285a35f38 100644 (file)
--- a/tornado/escape.py
+++ b/tornado/escape.py
@@ -49,8 +49,9 @@ try:
 except NameError:
     unichr = chr
 
-_XHTML_ESCAPE_RE = re.compile('[&<>"]')
-_XHTML_ESCAPE_DICT = {'&': '&amp;', '<': '&lt;', '>': '&gt;', '"': '&quot;'}
+_XHTML_ESCAPE_RE = re.compile('[&<>"\']')
+_XHTML_ESCAPE_DICT = {'&': '&amp;', '<': '&lt;', '>': '&gt;', '"': '&quot;',
+                      '\'': '&#39;'}
 
 
 def xhtml_escape(value):

diff --git a/tornado/test/escape_test.py b/tornado/test/escape_test.py
index 0370d77dada9b2dddd5ca8b1a7039de8c6117aaa..9abc74803aa712080726bc60cf82e541304303ad 100644 (file)
--- a/tornado/test/escape_test.py
+++ b/tornado/test/escape_test.py
@@ -144,7 +144,7 @@ class EscapeTestCase(unittest.TestCase):
             (u("<foo>"), u("&lt;foo&gt;")),
             (b"<foo>", b"&lt;foo&gt;"),
 
-            ("<>&\"", "&lt;&gt;&amp;&quot;"),
+            ("<>&\"'", "&lt;&gt;&amp;&quot;&#39;"),
             ("&amp;", "&amp;amp;"),
 
             (u("<\u00e9>"), u("&lt;\u00e9&gt;")),