[Formed-commits] r365 - in trunk: . formed/formed/model

[scm-commit@wald.intevation.org]

Author: roland
Date: 2010-06-02 12:06:25 +0200 (Wed, 02 Jun 2010)
New Revision: 365

Modified:
   trunk/ChangeLog
   trunk/formed/formed/model/exprtree.py
Log:
updated regular expression

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-05-17 10:58:49 UTC (rev 364)
+++ trunk/ChangeLog	2010-06-02 10:06:25 UTC (rev 365)
@@ -1,3 +1,7 @@
+2010-06-02	Roland Geider <roland.geider at intevation.de>
+
+	* formed/plugins/export/xls.py: updated regular expression
+
 2010-05-17	Frank Koormann <frank.koormann at intevation.de>
 
 	* formed/formed/plugins/export/latex.py: Improved section labeling.

Modified: trunk/formed/formed/model/exprtree.py
===================================================================
--- trunk/formed/formed/model/exprtree.py	2010-05-17 10:58:49 UTC (rev 364)
+++ trunk/formed/formed/model/exprtree.py	2010-06-02 10:06:25 UTC (rev 365)
@@ -41,7 +41,7 @@
 
 FLT_RE = re.compile(r'^([-+]?[0-9]*\.?[0-9]+([eE][-+]?[0-9]+)?)$')
 INT_RE = re.compile(r'^([-+]?[0-9]+)$')
-VAR_RE = re.compile(r'^\$|%(\w+)$')
+VAR_RE = re.compile(r'^[$%]([\w\-_]+)$')
 
 from shlex import split as lexsplit