Changeset 191:decb95fa8be5

Timestamp:

03/28/13 17:43:56 (2 months ago)

Author:

C?dric Krier <ced@…>

Branch:

default

Tags:

tip

Message:

Force output encoding for Genshi 0.7

genshi.output.encode and genshi.core.Stream.render doesn't have anymore utf-8
encoding as default value.

Location:

relatorio

Files:

• templates/opendocument.py (modified) (1 diff)
• tests/test_odt.py (modified) (4 diffs)

relatorio/templates/opendocument.py

@@ -851 +851 @@
                 for attr in ('compress_type', 'flag_bits', 'create_system'):
                     setattr(new_info, attr, getattr(f_info, attr))
-                serialized_stream = output_encode(self.xml_serializer(stream))
+                serialized_stream = output_encode(self.xml_serializer(stream),
+                    encoding='utf-8')
                 self.outzip.writestr(new_info, serialized_stream)
             elif f_info.filename == MANIFEST:

relatorio/tests/test_odt.py

@@ -235 +235 @@
         "Testing that styles get rendered"
         stream = self.oot.generate(**self.data)
-        rendered = stream.events.render()
+        rendered = stream.events.render(encoding='utf-8')
         ok_('We sell stuff' in rendered)
 
@@ -241 +241 @@
         del dico['footer']
         stream = self.oot.generate(**dico)
-        assert_raises(UndefinedError, lambda: stream.events.render())
+        assert_raises(UndefinedError,
+            lambda: stream.events.render(encoding='utf-8'))
 
     def test_generate(self):
         "Testing that content get rendered"
         stream = self.oot.generate(**self.data)
-        rendered = stream.events.render()
+        rendered = stream.events.render(encoding='utf-8')
         ok_('Bonjour,' in rendered)
         ok_('Trente' in rendered)
@@ -257 +258 @@
         stream = self.oot.generate(**self.data)
         translated = stream.filter(Translator(pseudo_gettext))
-        translated_xml = translated.events.render()
+        translated_xml = translated.events.render(encoding='utf-8')
         ok_("Hello," in translated_xml)
         ok_("I am an odt templating test" in translated_xml)
@@ -268 +269 @@
         "Testing the image replacement directive"
         stream = self.oot.generate(**self.data)
-        rendered = stream.events.render()
+        rendered = stream.events.render(encoding='utf-8')
         styles_idx = rendered.find('<?relatorio styles.xml?>')
         tree = lxml.etree.parse(StringIO(rendered[25:styles_idx]))