Changeset 102:91c56813903c

Timestamp:

01/23/09 02:00:03 (20 months ago)

Author:

Nicolas ?vrard <nicoe@…>

Parents:

100:33521906fedb (diff), 101:fc5e627d5325 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Branch:

default

Message:

Automated merge with ssh://oh/webapps/hg/repos/relatorio

Location:

relatorio/reporting.py

Files:

• . (modified) (3 diffs)
• . (modified) (6 diffs)

relatorio/reporting.py

@@ -84 +84 @@
 default_loader = MIMETemplateLoader(auto_reload=True)
 
+
 class DefaultFactory:
     """This is the default factory used by relatorio.
 
     It just returns a copy of the data it receives"""
+
+    def __init__(self, klass):
+        self.working_on = klass
 
     def __call__(self, **kwargs):
@@ -94 +98 @@
 
 default_factory = DefaultFactory()
+
 
 class Report:
@@ -150 +155 @@
             data_factory = self.default_factory
         reports = self.classes.setdefault(klass, ReportDict())
-        report = Report(_absolute(template_path), mimetype, data_factory(),
+        report = Report(_absolute(template_path), mimetype, data_factory(klass),
                         self.loader)
         reports.ids[report_name] = report, mimetype

relatorio/reporting.py

@@ -82 +82 @@
             cls.mime_func.append(id_function)
 
+default_loader = MIMETemplateLoader(auto_reload=True)
+
+
+class DefaultFactory:
+    """This is the default factory used by relatorio.
+
+    It just returns a copy of the data it receives"""
+
+    def __init__(self, klass):
+        self.working_on = klass
+
+    def __call__(self, **kwargs):
+        data = kwargs.copy()
+        return data
+
+default_factory = DefaultFactory()
+
 
 class Report:
@@ -87 +104 @@
     """
 
-    def __init__(self, path, mimetype, factory, loader):
+    def __init__(self, path, mimetype,
+                 factory=default_factory, loader=default_loader):
         self.fpath = path
         self.mimetype = mimetype
@@ -102 +120 @@
         return '<relatorio report on %s>' % self.fpath
 
-
-class DefaultFactory:
-    """This is the default factory used by relatorio.
-    
-    It just returns a copy of the data it receives"""
-
-    def __init__(self, klass):
-        self.working_on = klass
-
-    def __call__(self, **kwargs):
-        data = kwargs.copy()
-        return data
 
 
@@ -133 +139 @@
         self.classes = {}
         self.default_factory = datafactory
-        self.loader = MIMETemplateLoader(auto_reload=True)
+        self.loader = default_loader
 
     def add_report(self, klass, mimetype, template_path, data_factory=None,
@@ -139 +145 @@
         """adds a report to the repository.
 
-        You will be able to find the report via 
+        You will be able to find the report via
             - the class it is working on
             - the mimetype it outputs
             - the name of the report
-        
+
         You also have the opportunity to define a specific data_factory.
         """
@@ -152 +158 @@
                         self.loader)
         reports.ids[report_name] = report, mimetype
-        reports.mimetypes.setdefault(mimetype, []).append((report, report_name))
+        reports.mimetypes.setdefault(mimetype, []) \
+                         .append((report, report_name))
 
     def by_mime(self, klass, mimetype):