Changeset 18:432718b59587 for relatorio/reporting.py

Timestamp:

07/17/08 00:11:51 (5 years ago)

Author:

Nicolas Evrard <nicoe@…>

Branch:

default

Message:

- correctly import StringIO

• Allow the use of genshi filters on odt templates
  
  • divided the odt templates in three parts to stop abusing generate
    a Template object, a OOStream object, a OOSerializer object
    
  • the stream object is responsible for storing the stream of genshi events
    related to content.xml
    
  • the serializer object knows how to render a stream of event as if it was
    a specific oo file
    
• Fixed tests
  
  • we can now use the events for testing
    
  • ported test.odt to the new directive syntax
    
• The templates and the report are now meant to return genshi streams it is up
  to the framework implementer to call render on them or continue processing
  them.
  

Files:

• relatorio/reporting.py (modified) (2 diffs)

relatorio/reporting.py

@@ -19 +19 @@
 ###############################################################################
 
-__revision__ = "$Id: reporting.py 17 2008-07-15 10:26:58Z nicoe $"
+__revision__ = "$Id: reporting.py 19 2008-07-17 00:11:51Z nicoe $"
 __metaclass__ = type
 
 import os, sys
 import warnings
-import cStringIO
+from cStringIO import StringIO
 
 import pkg_resources
@@ -104 +104 @@
         self.data_factory = factory
         self.tmpl_loader = loader
+        self.filters = []
 
     def __call__(self, obj, **kwargs):
         template = self.tmpl_loader.load(self.fpath, self.mimetype)
         data = self.data_factory(obj, **kwargs)
-        report = template.generate(**data)
-        if not isinstance(report, (cStringIO.InputType, cStringIO.OutputType)):
-            report = StringIO(str(report))
-        return report
+        return template.generate(**data).filter(*self.filters)
 
     def __repr__(self):