diff options
| author | Greg Noel <GregNoel@tigris.org> | 2009-03-02 03:19:29 (GMT) |
|---|---|---|
| committer | Greg Noel <GregNoel@tigris.org> | 2009-03-02 03:19:29 (GMT) |
| commit | c1396537e5cae88e6357931dc6efe4074cf54ced (patch) | |
| tree | cbd8a625268ec290a2d2e03bbad4a94de8678919 /test/Deprecated | |
| parent | 22364c2fd6117fefb82e0addb7e9efca027e5c2e (diff) | |
| download | SCons-c1396537e5cae88e6357931dc6efe4074cf54ced.zip SCons-c1396537e5cae88e6357931dc6efe4074cf54ced.tar.gz SCons-c1396537e5cae88e6357931dc6efe4074cf54ced.tar.bz2 | |
replace execfile() by equivalent exec statement
Diffstat (limited to 'test/Deprecated')
| -rw-r--r-- | test/Deprecated/Options/Options.py | 2 | ||||
| -rw-r--r-- | test/Deprecated/Options/chdir.py | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/test/Deprecated/Options/Options.py b/test/Deprecated/Options/Options.py index d04ad44..f411478 100644 --- a/test/Deprecated/Options/Options.py +++ b/test/Deprecated/Options/Options.py @@ -241,7 +241,7 @@ opts.Save('options.saved', 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) # First test with no command line options diff --git a/test/Deprecated/Options/chdir.py b/test/Deprecated/Options/chdir.py index 0db8223..547fe53 100644 --- a/test/Deprecated/Options/chdir.py +++ b/test/Deprecated/Options/chdir.py @@ -52,7 +52,8 @@ print "VARIABLE =", repr(env['VARIABLE']) test.write(['bin', 'opts.cfg'], """\ import os os.chdir(os.path.split(__name__)[0]) -execfile('opts2.cfg') +import string +exec(string.replace(open('opts2.cfg').read(), '\\r', '\\n')) """) test.write(['bin', 'opts2.cfg'], """\ |