Support non-ascii template filenames.

Fixes #1502.

diff --git a/tornado/template.py b/tornado/template.py
index 959b191d624a9132404a715f8d9c4bf9f6c0fca4..fa588991e7a0e39b0241dcc5c8df7e16efb1f6d3 100644 (file)
--- a/tornado/template.py
+++ b/tornado/template.py
@@ -271,7 +271,7 @@ class Template(object):
         .. versionchanged:: 4.3
            Added ``whitespace`` parameter; deprecated ``compress_whitespace``.
         """
-        self.name = name
+        self.name = escape.native_str(name)
 
         if compress_whitespace is not _UNSET:
             # Convert deprecated compress_whitespace (bool) to whitespace (str).

diff --git a/tornado/test/template_test.py b/tornado/test/template_test.py
index 77f42e2f0afe33d57f0e6242afe38eca82f2fb63..0c8eb51cb896335bbea403b51953c3576caeb260 100644 (file)
--- a/tornado/test/template_test.py
+++ b/tornado/test/template_test.py
@@ -173,6 +173,10 @@ try{% set y = 1/x %}
         template = Template('{{ 1 / 2 }}')
         self.assertEqual(template.generate(), '0')
 
+    def test_non_ascii_name(self):
+        loader = DictLoader({u("t\u00e9st.html"): "hello"})
+        self.assertEqual(loader.load(u("t\u00e9st.html")).generate(), b"hello")
+
 
 class StackTraceTest(unittest.TestCase):
     def test_error_line_number_expression(self):