summaryrefslogtreecommitdiffstats
path: root/src/engine
diff options
context:
space:
mode:
authorGreg Noel <GregNoel@tigris.org>2009-03-02 03:19:29 (GMT)
committerGreg Noel <GregNoel@tigris.org>2009-03-02 03:19:29 (GMT)
commitc1396537e5cae88e6357931dc6efe4074cf54ced (patch)
treecbd8a625268ec290a2d2e03bbad4a94de8678919 /src/engine
parent22364c2fd6117fefb82e0addb7e9efca027e5c2e (diff)
downloadSCons-c1396537e5cae88e6357931dc6efe4074cf54ced.zip
SCons-c1396537e5cae88e6357931dc6efe4074cf54ced.tar.gz
SCons-c1396537e5cae88e6357931dc6efe4074cf54ced.tar.bz2
replace execfile() by equivalent exec statement
Diffstat (limited to 'src/engine')
-rw-r--r--src/engine/SCons/Variables/VariablesTests.py2
-rw-r--r--src/engine/SCons/Variables/__init__.py2
-rw-r--r--src/engine/SCons/compat/_scons_optparse.py2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/engine/SCons/Variables/VariablesTests.py b/src/engine/SCons/Variables/VariablesTests.py
index 153b1aa..f1caff7 100644
--- a/src/engine/SCons/Variables/VariablesTests.py
+++ b/src/engine/SCons/Variables/VariablesTests.py
@@ -54,7 +54,7 @@ def check(key, value, env):
def checkSave(file, expected):
gdict = {}
ldict = {}
- execfile(file, gdict, ldict)
+ exec string.replace(open(file).read(), '\r', '\n') in gdict, ldict
assert expected == ldict, "%s\n...not equal to...\n%s" % (expected, ldict)
class VariablesTestCase(unittest.TestCase):
diff --git a/src/engine/SCons/Variables/__init__.py b/src/engine/SCons/Variables/__init__.py
index e7b4316..3cc6694 100644
--- a/src/engine/SCons/Variables/__init__.py
+++ b/src/engine/SCons/Variables/__init__.py
@@ -166,7 +166,7 @@ class Variables:
sys.path.insert(0, dir)
try:
values['__name__'] = filename
- execfile(filename, {}, values)
+ exec string.replace(open(filename).read(), '\r', '\n') in {}, values
finally:
if dir:
del sys.path[0]
diff --git a/src/engine/SCons/compat/_scons_optparse.py b/src/engine/SCons/compat/_scons_optparse.py
index 386dfea..23f2ad3 100644
--- a/src/engine/SCons/compat/_scons_optparse.py
+++ b/src/engine/SCons/compat/_scons_optparse.py
@@ -920,7 +920,7 @@ class Values:
def read_file(self, filename, mode="careful"):
vars = {}
- execfile(filename, vars)
+ exec string.replace(open(filename).read(), '\r', '\n') in vars
self._update(vars, mode)
def ensure_value(self, attr, value):