Commit: 12787b7a4fbdeb056e8f815b1edc8bda2cee65ed - tlexi (git)

generic text markup tools

Commit MetaInfo

• Revisão: 12787b7a4fbdeb056e8f815b1edc8bda2cee65ed (tree)
• Hora: 2014-02-06 19:55:41
• Autor: hylom <hylom@hylo...>
• Commiter: hylom

Mensagem de Log

fix _expand_variable()

Mudança Sumário

• modified: textparser.py

Diff

--- a/textparser.py
+++ b/textparser.py
@@ -266,15 +266,12 @@ class Parser(object):
             text = rex.sub(match_func, text)
 
         # expand vars
-        rex = re.compile('\${?([A-Za-z0-9_]+)}?')
+        rex = re.compile('(\${?[A-Za-z0-9_]+}?)')
         m = rex.search(text)
         if m:
             def sub_func(x):
-                val = self.store.load(x.group(1))
-                if val != None:
-                    return val
-                else:
-                    return "$" + x.group(1)
+                key = re.sub(u"[${}]", "", x.group(1))
+                return self.store.load(key, x.group(1))
             text = rex.sub(sub_func, text)
         return text