Changeset 92:53dafd0b9cc4

Timestamp:

01/20/09 09:37:29 (14 months ago)

Author:

Ga?tan de Menten <ged@…>

Branch:

default

Message:

made factory and loader arguments of the Report constructor optional (use
defaults)

Files:

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

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 __call__(self, **kwargs):
+        data = kwargs.copy()
+        return data
+
+default_factory = DefaultFactory()
 
 class Report:
@@ -87 +99 @@
     """
 
-    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 +115 @@
         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 __call__(self, **kwargs):
-        data = kwargs.copy()
-        return data
 
 
@@ -130 +134 @@
         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,
@@ -136 +140 @@
         """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.
         """
@@ -149 +153 @@
                         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):