Fixed expressions token replacing braces

marinho · Jun 17, 2010 · 0448346 · 0448346
1 parent b1c64bc
commit 0448346
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,11 @@
+2010-06-17: Version 0.4.5-stable
+--------------------------------
+* Fixed expressions token replacing braces
+
+2010-06-17: Version 0.4.4-stable
+--------------------------------
+* Fixed bug on complex expressions with braces 
+
 2010-05-06: Version 0.4.3-stable
 --------------------------------
 * Fixed cross reference matrix and expressions to avoid use existing object as dictionary

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

diff --git a/geraldo/widgets.py b/geraldo/widgets.py
@@ -81,6 +81,7 @@ def clone(self):
         return new
 
 EXP_QUOTED = re.compile('\w\(([^\'"].+?[^\'"])(|,.*?)\)')
+EXP_QUOTED_SUB = re.compile('\(([^\'"].+?[^\'"])(|,.*?)\)')
 EXP_TOKENS = re.compile('([\w\._]+|\*\*|\+|\-|\*|\/)')
 
 class ObjectValue(Label):
@@ -129,7 +130,7 @@ def prepare_expression(self):
                     self.expression = 'value("%s")' % self.expression
                 break
 
-            self.expression = EXP_QUOTED.sub('("%s"%s)'%(f[0][0], f[0][1]), self.expression, 1)
+            self.expression = EXP_QUOTED_SUB.sub('("%s"%s)'%(f[0][0], f[0][1]), self.expression, 1)
 
     def get_object_value(self, instance=None, attribute_name=None):
         """Return the attribute value for just an object"""

diff --git a/pypi_upload.sh b/pypi_upload.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 python setup.py sdist upload
-python setup.py bdist upload
+#python setup.py bdist upload