Rename varReplaceWithItems to template_ds

This commit is contained in:
Daniel Hokka Zakrisson 2012-11-09 15:43:15 +01:00
commit 383dc30560
4 changed files with 14 additions and 14 deletions

View file

@ -177,8 +177,8 @@ def _varReplaceFilesAndPipes(basedir, raw, vars):
return ''.join(done)
def varReplaceWithItems(basedir, varname, vars):
''' helper function used by with_items '''
def template_ds(basedir, varname, vars):
''' templates a data structure by traversing it and substituting for other data structures '''
if isinstance(varname, basestring):
m = _varFind(varname, vars)
@ -186,17 +186,17 @@ def varReplaceWithItems(basedir, varname, vars):
return varname
if m['start'] == 0 and m['end'] == len(varname):
if m['replacement'] is not None:
return varReplaceWithItems(basedir, m['replacement'], vars)
return template_ds(basedir, m['replacement'], vars)
else:
return varname
else:
return template(basedir, varname, vars)
elif isinstance(varname, (list, tuple)):
return [varReplaceWithItems(basedir, v, vars) for v in varname]
return [template_ds(basedir, v, vars) for v in varname]
elif isinstance(varname, dict):
d = {}
for (k, v) in varname.iteritems():
d[k] = varReplaceWithItems(basedir, v, vars)
d[k] = template_ds(basedir, v, vars)
return d
else:
return varname