From: Ben Darnell <ben@bendarnell.com>
Date: Wed, 16 Feb 2011 21:34:35 +0000 (-0800)
Subject: Add linkify to the default template namespace.
X-Git-Tag: v1.2.0~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4e6b96fbcbe0a906ba2f4beee01a07f06fce4567;p=thirdparty%2Ftornado.git

Add linkify to the default template namespace.
---

diff --git a/tornado/template.py b/tornado/template.py
index d18d158b7..34dc0689e 100644
--- a/tornado/template.py
+++ b/tornado/template.py
@@ -119,6 +119,7 @@ class Template(object):
             "url_escape": escape.url_escape,
             "json_encode": escape.json_encode,
             "squeeze": escape.squeeze,
+            "linkify": escape.linkify,
             "datetime": datetime,
         }
         namespace.update(kwargs)
diff --git a/website/templates/documentation.txt b/website/templates/documentation.txt
index b1a903a39..1dd6b6632 100644
--- a/website/templates/documentation.txt
+++ b/website/templates/documentation.txt
@@ -270,6 +270,7 @@ not present).
  * `url_escape`: alias for `tornado.escape.url_escape`
  * `json_encode`: alias for `tornado.escape.json_encode`
  * `squeeze`: alias for `tornado.escape.squeeze`
+ * `linkify`: alias for `tornado.escape.linkify`
  * `datetime`: the Python `datetime` module
  * `handler`: the current `RequestHandler` object
  * `request`: alias for `handler.request`