From 340d57481935334465037d97c0db1555b70c0eb1 Mon Sep 17 00:00:00 2001 From: Luca Falavigna Date: Tue, 15 Jun 2010 09:21:32 +0000 Subject: Imported Upstream version 2.0.0 --- engine/SCons/Tool/textfile.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'engine/SCons/Tool/textfile.py') diff --git a/engine/SCons/Tool/textfile.py b/engine/SCons/Tool/textfile.py index 5d1611b..0293bb9 100644 --- a/engine/SCons/Tool/textfile.py +++ b/engine/SCons/Tool/textfile.py @@ -44,7 +44,7 @@ Textfile/Substfile builder for SCons. is unpredictible whether the expansion will occur. """ -__revision__ = "src/engine/SCons/Tool/textfile.py 4720 2010/03/24 03:14:11 jars" +__revision__ = "src/engine/SCons/Tool/textfile.py 5023 2010/06/14 22:05:46 scons" import SCons @@ -84,12 +84,12 @@ def _action(target, source, env): % repr(linesep), None) # create a dictionary to use for the substitutions - if not env.has_key('SUBST_DICT'): + if 'SUBST_DICT' not in env: subs = None # no substitutions else: d = env['SUBST_DICT'] if is_Dict(d): - d = d.items() + d = list(d.items()) elif is_Sequence(d): pass else: -- cgit v1.2.3