summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2001-09-13 02:03:37 (GMT)
committerSteven Knight <knight@baldmt.com>2001-09-13 02:03:37 (GMT)
commit2ce8c28159f0e88494883f61cd05d1342fe90201 (patch)
treeb710c6fcc230f5621556fa17c7eaea6ecf87baf8
parente3e7b09d110ace0334c941eec930f3d651fe1151 (diff)
downloadSCons-2ce8c28159f0e88494883f61cd05d1342fe90201.zip
SCons-2ce8c28159f0e88494883f61cd05d1342fe90201.tar.gz
SCons-2ce8c28159f0e88494883f61cd05d1342fe90201.tar.bz2
Fix Python 2.1 warning
-rw-r--r--src/scons.py4
-rw-r--r--test/errors.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/scons.py b/src/scons.py
index 16fb0bf..b08b786 100644
--- a/src/scons.py
+++ b/src/scons.py
@@ -517,14 +517,14 @@ def main():
while Scripts:
file, Scripts = Scripts[0], Scripts[1:]
if file == "-":
- exec sys.stdin
+ exec sys.stdin in globals()
else:
try:
f = open(file, "r")
except IOError, s:
sys.stderr.write("Ignoring missing script '%s'\n" % file)
else:
- exec f
+ exec f in globals()
if local_help:
# They specified -h, but there was no Help() inside the
diff --git a/test/errors.py b/test/errors.py
index a4b05cc..54e26b9 100644
--- a/test/errors.py
+++ b/test/errors.py
@@ -49,7 +49,7 @@ expect = r"""Traceback \((most recent call|innermost) last\):
File "%s", line \d+, in \?
main\(\)
File "%s", line \d+, in main
- exec f
+ exec f in globals\(\)
File "SConstruct3", line \d+, in \?
raise InternalError, 'error inside'
InternalError: error inside