[qooxdoo-commit] SF.net SVN: qooxdoo: [12719] trunk/qooxdoo/frontend/tool/generator/Config. py

[<th...@us...>]

Revision: 12719
          http://qooxdoo.svn.sourceforge.net/qooxdoo/?rev=12719&view=rev
Author:   thron7
Date:     2008-03-31 05:36:13 -0700 (Mon, 31 Mar 2008)

Log Message:
-----------
more code clean-up

Modified Paths:
--------------
    trunk/qooxdoo/frontend/tool/generator/Config.py

Modified: trunk/qooxdoo/frontend/tool/generator/Config.py
===================================================================
--- trunk/qooxdoo/frontend/tool/generator/Config.py	2008-03-31 12:15:39 UTC (rev 12718)
+++ trunk/qooxdoo/frontend/tool/generator/Config.py	2008-03-31 12:36:13 UTC (rev 12719)
@@ -235,20 +235,7 @@
                 pass
 
 
-        def _expandMacrosInLet(letList):
-            """ takes array of pairs and returns dict with pair[0]:pair[1] entries
-                with macros expanded along the way"""
-
-            dict = {}
-            for pair in letList:
-                v = pair[1]
-                if (v.find(r'${')>-1):
-                    v = _expandString(pair[1], dict)  # apply what we have so far
-                dict[pair[0]] = v
-            return dict
-
-
-        def _expandMacrosInLet1(letDict):
+        def _expandMacrosInLet(letDict):
             """ takes dict with macro definitions and expands all of them within the dict"""
 
             keys = letDict.keys()
@@ -271,7 +258,7 @@
             else:
                 if config[job].has_key('let'):
                     # exand macros in the let
-                    config[job]['let'] = _expandMacrosInLet1(config[job]['let'])
+                    config[job]['let'] = _expandMacrosInLet(config[job]['let'])
                     # apply dict to other values
                     _expandMacrosInValues(config[job], config[job]['let'])
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.