Fixed unicode issues for XML template with Python 2

Author: cmeerw

roundup/cgi/TAL/XMLParser.py

@@ -49,6 +49,10 @@ class XMLParser:
 
     def __init__(self, encoding=None):
         self.parser = p = self.createParser()
+        # Make sure we don't get fed unicode strings in Python 2 as we
+        # can't handle those
+        if hasattr(self.parser, 'returns_unicode'):
+            self.parser.returns_unicode = False
         if self.ordered_attributes:
             try:
                 self.parser.ordered_attributes = self.ordered_attributes

test/test_cgi.py

@@ -807,6 +807,16 @@ def hasPermission(s, p, classname=None, d=None, e=None, **kw):
         </html>
         """.strip ())
 
+    def testXMLTemplate(self):
+        page_template = """<?xml version="1.0" encoding="UTF-8"?><feed xmlns="http://www.w3.org/2005/Atom" xmlns:tal="http://xml.zope.org/namespaces/tal" xmlns:metal="http://xml.zope.org/namespaces/metal"></feed>"""
+        pt = RoundupPageTemplate()
+        pt.pt_edit(page_template, 'application/xml')
+
+        cl = self.setupClient({ }, 'issue',
+                env_addon = {'HTTP_REFERER': 'http://whoami.com/path/'})
+        out = pt.render(cl, 'issue', MockNull())
+        self.assertEquals(out, '<?xml version="1.0" encoding="UTF-8"?><feed\n    xmlns="http://www.w3.org/2005/Atom"/>\n')
+
     def testCsrfProtection(self):
         # need to set SENDMAILDEBUG to prevent
         # downstream issue when email is sent on successful