From: Ben Darnell Date: Sun, 3 Mar 2013 17:23:28 +0000 (-0500) Subject: Use autoescape in websocket chat demo. X-Git-Tag: v3.0.0~68 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bc4917b65b25e26b388abc181895befa4cc86202;p=thirdparty%2Ftornado.git Use autoescape in websocket chat demo. --- diff --git a/demos/websocket/chatdemo.py b/demos/websocket/chatdemo.py index e2bd5f643..a62313936 100755 --- a/demos/websocket/chatdemo.py +++ b/demos/websocket/chatdemo.py @@ -43,7 +43,6 @@ class Application(tornado.web.Application): template_path=os.path.join(os.path.dirname(__file__), "templates"), static_path=os.path.join(os.path.dirname(__file__), "static"), xsrf_cookies=True, - autoescape=None, ) tornado.web.Application.__init__(self, handlers, **settings) diff --git a/demos/websocket/templates/index.html b/demos/websocket/templates/index.html index 68721e7ee..6b3674928 100644 --- a/demos/websocket/templates/index.html +++ b/demos/websocket/templates/index.html @@ -1,7 +1,7 @@ - + Tornado Chat Demo @@ -20,7 +20,7 @@ - {{ xsrf_form_html() }} + {% module xsrf_form_html() %} diff --git a/demos/websocket/templates/message.html b/demos/websocket/templates/message.html index 612f4cf34..aa817fdfa 100644 --- a/demos/websocket/templates/message.html +++ b/demos/websocket/templates/message.html @@ -1,2 +1 @@ -{% import tornado.escape %} -
{{ tornado.escape.linkify(message["body"]) }}
+
{% module linkify(message["body"]) %}