diff options
| author | Gary Oberbrunner <garyo@oberbrunner.com> | 2013-09-22 17:10:51 (GMT) |
|---|---|---|
| committer | Gary Oberbrunner <garyo@oberbrunner.com> | 2013-09-22 17:10:51 (GMT) |
| commit | b554eb817c60f4e419bbc84efc02c7fbc62b7ced (patch) | |
| tree | 5d6a8f035bcce302da428d3dd9d26920407a78ee /src/engine/SCons/Script | |
| parent | 953dc41b8b720fdcec7955de67d23206214e5125 (diff) | |
| download | SCons-b554eb817c60f4e419bbc84efc02c7fbc62b7ced.zip SCons-b554eb817c60f4e419bbc84efc02c7fbc62b7ced.tar.gz SCons-b554eb817c60f4e419bbc84efc02c7fbc62b7ced.tar.bz2 | |
Manual python3 post-2to3 fixes from Neal Becker
Diffstat (limited to 'src/engine/SCons/Script')
| -rw-r--r-- | src/engine/SCons/Script/SConscript.py | 2 | ||||
| -rw-r--r-- | src/engine/SCons/Script/__init__.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/engine/SCons/Script/SConscript.py b/src/engine/SCons/Script/SConscript.py index fefffef..05cb6a6 100644 --- a/src/engine/SCons/Script/SConscript.py +++ b/src/engine/SCons/Script/SConscript.py @@ -257,7 +257,7 @@ def _SConscript(fs, *files, **kw): pass try: try: - exec(_file_, call_stack[-1].globals) + exec(_file_.read(), call_stack[-1].globals) except SConscriptReturn: pass finally: diff --git a/src/engine/SCons/Script/__init__.py b/src/engine/SCons/Script/__init__.py index 9f2837c..e9e8b71 100644 --- a/src/engine/SCons/Script/__init__.py +++ b/src/engine/SCons/Script/__init__.py @@ -364,7 +364,7 @@ GlobalDefaultBuilders = [ ] for name in GlobalDefaultEnvironmentFunctions + GlobalDefaultBuilders: - exec("%s = _SConscript.DefaultEnvironmentCall(%s)" % (name, repr(name))) + exec ("%s = _SConscript.DefaultEnvironmentCall(%s)" % (name, repr(name))) del name # There are a handful of variables that used to live in the |