From: Ben Darnell <ben@bendarnell.com>
Date: Tue, 26 Jul 2011 17:50:32 +0000 (-0700)
Subject: Allow unicode string literals to appear in template expressions.
X-Git-Tag: v2.1.0~68
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a0ff0ed9e23cd48b4ce73a215134ee21fccbeea2;p=thirdparty%2Ftornado.git

Allow unicode string literals to appear in template expressions.

Closes #313.
---

diff --git a/tornado/template.py b/tornado/template.py
index 8963fd452..ce83a12e3 100644
--- a/tornado/template.py
+++ b/tornado/template.py
@@ -121,7 +121,8 @@ class Template(object):
         self.file = _File(_parse(reader, self))
         self.code = self._generate_python(loader, compress_whitespace)
         try:
-            self.compiled = compile(self.code, "<template %s>" % self.name,
+            self.compiled = compile(escape.to_unicode(self.code),
+                                    "<template %s>" % self.name,
                                     "exec")
         except Exception:
             formatted_code = _format_code(self.code).rstrip()
diff --git a/tornado/test/template_test.py b/tornado/test/template_test.py
index 037e3625c..e04c2544a 100644
--- a/tornado/test/template_test.py
+++ b/tornado/test/template_test.py
@@ -57,6 +57,23 @@ class TemplateTest(LogTrapTestCase):
         self.assertEqual(Template("{%!").generate(), b("{%"))
         self.assertEqual(Template("{{ 'expr' }} {{!jquery expr}}").generate(),
                          b("expr {{jquery expr}}"))
+
+    def test_unicode_template(self):
+        template = Template(utf8(u"\u00e9"))
+        self.assertEqual(template.generate(), utf8(u"\u00e9"))
+
+    def test_unicode_literal_expression(self):
+        # Unicode literals should be usable in templates.  Note that this
+        # test simulates unicode characters appearing directly in the
+        # template file (with utf8 encoding), i.e. \u escapes would not
+        # be used in the template file itself.
+        if str is unicode:
+            # python 3 needs a different version of this test since
+            # 2to3 doesn't run on template internals
+            template = Template(utf8(u'{{ "\u00e9" }}'))
+        else:
+            template = Template(utf8(u'{{ u"\u00e9" }}'))
+        self.assertEqual(template.generate(), utf8(u"\u00e9"))
         
 
 class AutoEscapeTest(LogTrapTestCase):