- A bug was fixed whereby including numeric entity elements

in the source of a PageTemplate would cause a UnicodeDecodeError. [chrism] Repeat by attempting to run the following script under an unfixed version: import z3c.pt from zope.configuration import xmlconfig xmlconfig.file('configure.zcml', z3c.pt) pt = """<html xmlns="http://www.w3.org/1999/xhtml" xmlns:tal="http://xml.zope.org/namespaces/tal"> © </html>""" from z3c.pt.pagetemplate import PageTemplate t = PageTemplate(pt) t.render()
zopefoundation · Jul 21, 2008 · 1f4933e · 1f4933e
1 parent c798771
commit 1f4933e
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -4,6 +4,10 @@ Changelog
 Version 0.8.x
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+- A bug was fixed whereby including numeric entity elements
+  in the source of a PageTemplate would cause a UnicodeDecodeError.
+  [chrism]
+
 - When templates are instantiated outside of a class-definition, a
   relative file path will be made absolute using the module path.
   [malthe]

diff --git a/src/z3c/pt/generation.py b/src/z3c/pt/generation.py
@@ -100,7 +100,7 @@ def __call__(self):
         if args:
             args += ', '
 
-        code = self.stream.getvalue()
+        code = self.stream.getvalue().encode('utf-8')
         return wrapper % (args, code), {'generation': z3c.pt.generation}
 
 class BufferIO(list):

diff --git a/src/z3c/pt/tests/test_generation.py b/src/z3c/pt/tests/test_generation.py
@@ -0,0 +1,14 @@
+import unittest
+
+class TestGenerator(unittest.TestCase):
+    def test_generator_returns_utf_8_encoded_text(self):
+        from z3c.pt.generation import Generator
+        gen = Generator([])
+        from StringIO import StringIO
+        gen.stream = StringIO(u'<div>\xc2\xa9</div>')
+        code, ns = gen()
+        self.failUnless(isinstance(code, str), repr(code))
+
+def test_suite():
+    import sys
+    return unittest.findTestCases(sys.modules[__name__])