Implementing new event on ObjectValue: on_expression_error

marinho · Jun 24, 2010 · 22af69a · 22af69a
1 parent 0448346
commit 22af69a
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/geraldo/__init__.py b/geraldo/__init__.py
@@ -43,7 +43,7 @@
 - tests - a package with automated doc tests.
 """
 
-VERSION = (0, 4, 5, 'stable')
+VERSION = (0, 4, 6, 'stable')
 
 def get_version():
     return '%d.%d.%d-%s'%VERSION

diff --git a/geraldo/base.py b/geraldo/base.py
@@ -433,7 +433,6 @@ def generate_by(self, generator_class, *args, **kwargs):
         if not self.print_if_empty and not self.queryset:
             raise EmptyQueryset("This report doesn't accept empty queryset")
 
-        # TODO: use multiprocessing
         # Initialize generator instance
         generator = generator_class(self, *args, **kwargs)
 

diff --git a/geraldo/generators/pdf.py b/geraldo/generators/pdf.py
@@ -329,7 +329,7 @@ def generate_pages(self):
 
             # Multiple canvas support (closes current and creates a new
             # once if reaches the max pages for temp file)
-            if num and self.multiple_canvas and num%self.temp_files_max_pages == 0:
+            if num and self.multiple_canvas and num % self.temp_files_max_pages == 0:
                 self.close_current_canvas()
                 del self.canvas
                 self.start_canvas()

diff --git a/geraldo/widgets.py b/geraldo/widgets.py
@@ -109,6 +109,11 @@ class ObjectValue(Label):
     converts_decimal_to_float = False
     converts_float_to_decimal = True
     _cached_text = None
+    on_expression_error = None # Expected arguments:
+                               #  - widget
+                               #  - instance
+                               #  - exception
+                               #  - expression
 
     def __init__(self, *args, **kwargs):
         super(ObjectValue, self).__init__(*args, **kwargs)
@@ -254,6 +259,7 @@ def clone(self):
         new.objects = self.objects
         new.stores_text_in_cache = self.stores_text_in_cache
         new.expression = self.expression
+        new.on_expression_error = self.on_expression_error
 
         return new
 
@@ -286,7 +292,13 @@ def get_value_by_expression(self, expression=None):
                 'p': self.report.parent_object, # Just a short alias
                 })
 
-        return eval(expression, global_vars)
+        try:
+            return eval(expression, global_vars)
+        except Exception, e:
+            if not callable(self.on_expression_error):
+                raise
+
+            return on_expression_error(self, e, expression, self.instance)
 
 class SystemField(Label):
     """This shows system informations, like the report title, current date/time,