Merge branch 'master' of github.com:marinho/geraldo

marinho · May 6, 2010 · 46aeba9 · 46aeba9
2 parents def1238 + 9a4ff09
commit 46aeba9
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 11 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,7 @@
+2010-05-06: Version 0.4.3-stable
+--------------------------------
+* Fixed cross reference matrix and expressions to avoid use existing object as dictionary
+
 2010-04-29: Version 0.4.2-stable
 --------------------------------
 * Implemented support to merge default_style to inherite reports

diff --git a/geraldo/__init__.py b/geraldo/__init__.py
@@ -43,7 +43,7 @@
 - tests - a package with automated doc tests.
 """
 
-VERSION = (0, 4, 2, 'stable')
+VERSION = (0, 4, 3, 'stable')
 
 def get_version():
     return '%d.%d.%d-%s'%VERSION

diff --git a/geraldo/widgets.py b/geraldo/widgets.py
@@ -136,6 +136,13 @@ def get_object_value(self, instance=None, attribute_name=None):
         instance = instance or self.instance
         attribute_name = attribute_name or self.attribute_name
 
+        # Checks lambda and instance
+        if self.get_value and instance:
+            try:
+                return self.get_value(self, instance)
+            except TypeError:
+                return self.get_value(instance)
+
         # Checks this is an expression
         tokens = EXP_TOKENS.split(attribute_name)
         tokens = filter(bool, tokens) # Cleans empty parts
@@ -146,13 +153,6 @@ def get_object_value(self, instance=None, attribute_name=None):
                     values[token] = self.get_object_value(instance, token)
             return eval(attribute_name, values)
 
-        # Checks lambda and instance
-        if self.get_value and instance:
-            try:
-                return self.get_value(self, instance)
-            except TypeError:
-                return self.get_value(instance)
-
         # Gets value with function
         value = get_attr_value(instance, attribute_name)
 
@@ -235,7 +235,10 @@ def _text(self):
                     value = getattr(self, 'action_'+self.action)()
 
             if self.get_text:
-                self._cached_text = unicode(self.get_text(self.instance, value))
+                try:
+                    self._cached_text = unicode(self.get_text(self, self.instance, value))
+                except TypeError:
+                    self._cached_text = unicode(self.get_text(self.instance, value))
             else:
                 self._cached_text = unicode(value)
 
@@ -261,9 +264,9 @@ def get_value_by_expression(self, expression=None):
         if not self.instance:
             global_vars = {}
         elif isinstance(self.instance, dict):
-            global_vars = self.instance
+            global_vars = self.instance.copy()
         else:
-            global_vars = self.instance.__dict__
+            global_vars = self.instance.__dict__.copy()
 
         global_vars.update({
             'value': self.action_value,