diff options
author | Greg Noel <GregNoel@tigris.org> | 2009-04-22 21:59:19 (GMT) |
---|---|---|
committer | Greg Noel <GregNoel@tigris.org> | 2009-04-22 21:59:19 (GMT) |
commit | 9278fdaefa6ba913a031432705e9ff6cc0e49541 (patch) | |
tree | 60a959fa28dcd46da1f2ca60c903699aa817b746 /src | |
parent | 05a824904daa8e3b04bd0222c198d70b9240f73e (diff) | |
download | SCons-9278fdaefa6ba913a031432705e9ff6cc0e49541.zip SCons-9278fdaefa6ba913a031432705e9ff6cc0e49541.tar.gz SCons-9278fdaefa6ba913a031432705e9ff6cc0e49541.tar.bz2 |
Fix regression failure (shadowed variable) in Python 2.1
Diffstat (limited to 'src')
-rw-r--r-- | src/engine/SCons/Tool/textfile.py | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/src/engine/SCons/Tool/textfile.py b/src/engine/SCons/Tool/textfile.py index 8fa2180..586b182 100644 --- a/src/engine/SCons/Tool/textfile.py +++ b/src/engine/SCons/Tool/textfile.py @@ -117,17 +117,17 @@ def _action(target, source, env): def _strfunc(target, source, env): return "Creating '%s'" % target[0] +def _convert_list_R(newlist, sources): + for elem in sources: + if is_Sequence(elem): + _convert_list_R(newlist, elem) + elif isinstance(elem, Node): + newlist.append(elem) + else: + newlist.append(Value(elem)) def _convert_list(target, source, env): if len(target) != 1: raise SCons.Errors.UserError("Only one target file allowed") - def _convert_list_R(newlist, sources): - for elem in sources: - if is_List(elem): - _convert_list_R(newlist, elem) - elif isinstance(elem, Node): - newlist.append(elem) - else: - newlist.append(Value(elem)) newlist = [] _convert_list_R(newlist, source) return target, newlist @@ -164,3 +164,9 @@ def generate(env): def exists(env): return 1 + +# Local Variables: +# tab-width:4 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=4 shiftwidth=4: |