Make xhtml_escape available in the template namespace under its own name

in addition to "escape".

diff --git a/tornado/template.py b/tornado/template.py
index bea95bb66cf8b4186ce15230bd79599dc83d8c48..14cb967e2da81350b96a9a3882654e8add6461bf 100644 (file)
--- a/tornado/template.py
+++ b/tornado/template.py
@@ -115,6 +115,7 @@ class Template(object):
         """Generate this template with the given arguments."""
         namespace = {
             "escape": escape.xhtml_escape,
+            "xhtml_escape": escape.xhtml_escape,
             "url_escape": escape.url_escape,
             "json_encode": escape.json_encode,
             "squeeze": escape.squeeze,

diff --git a/website/templates/documentation.txt b/website/templates/documentation.txt
index 30da201c70c646df40280b4b8304528f0d499517..45cab52a11182ce901337c17ec423201835c5e56 100644 (file)
--- a/website/templates/documentation.txt
+++ b/website/templates/documentation.txt
@@ -268,6 +268,7 @@ module directly outside of a `RequestHandler` many of these entries are
 not present).
 
  * `escape`: alias for `tornado.escape.xhtml_escape`
+ * `xhtml_escape`: alias for `tornado.escape.xhtml_escape`
  * `url_escape`: alias for `tornado.escape.url_escape`
  * `json_encode`: alias for `tornado.escape.json_encode`
  * `squeeze`: alias for `tornado.escape.squeeze`