Fixed issue #57: non-unicode, non-ascii templates in Template.render()

pystache/template.py

@@ -197,6 +197,12 @@ class Template(object):
         self.tag_re = re.compile(tag)
 
     def _render(self, template):
+        """
+        Arguments:
+
+          template: a unicode template string.
+
+        """
         output = []
 
         while True:
@@ -350,11 +356,11 @@ class Template(object):
 
     def render(self, context=None, **kwargs):
         """
-        Return the template rendered using the current context.
+        Return the template rendered using the given context.
 
         The return value is a unicode string, unless the output_encoding
-        attribute is not None, in which case the return value has type str
-        and is encoded using that encoding.
+        attribute has been set to a non-None value, in which case the
+        return value has type str and is encoded using that encoding.
 
         Arguments:
 
@@ -366,7 +372,11 @@ class Template(object):
         """
         self._initialize_context(context, **kwargs)
 
-        result = self._render(self.template)
+        template = self.template
+        if not isinstance(template, unicode):
+            template = self.unicode(template)
+
+        result = self._render(template)
 
         if self.output_encoding is not None:
             result = result.encode(self.output_encoding)

tests/test_template.py

@@ -149,7 +149,7 @@ class TemplateTestCase(unittest.TestCase):
     def test_render__str(self):
         template = Template('foo')
         actual = template.render()
-        self.assertTrue(isinstance(actual, str))
+        self.assertTrue(isinstance(actual, unicode))
         self.assertEquals(actual, 'foo')
 
     def test_render__non_ascii_character(self):
@@ -327,3 +327,18 @@ class TemplateTestCase(unittest.TestCase):
 
         template.default_encoding = 'utf_8'
         self.assertEquals(template.render(context), u"déf")
+
+    def test_render__nonascii_template(self):
+        """
+        Test passing a non-unicode template with non-ascii characters.
+
+        """
+        template = Template("déf", output_encoding="utf-8")
+
+        # Check that decode_errors and default_encoding are both respected.
+        template.decode_errors = 'ignore'
+        template.default_encoding = 'ascii'
+        self.assertEquals(template.render(), "df")
+
+        template.default_encoding = 'utf_8'
+        self.assertEquals(template.render(), "déf")