diff options
| author | Thomas Berg <merlin66b@gmail.com> | 2017-09-20 11:24:22 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2017-09-25 16:16:29 (GMT) |
| commit | 2e0de3c55f22b3eaa7767b69740b898f3d2f46bf (patch) | |
| tree | bd0a1aef3efcc5221f589575db23ff6279569c80 /src | |
| parent | 381cd3a385330d03df615aa6aed205ba9aa40ae4 (diff) | |
| download | SCons-2e0de3c55f22b3eaa7767b69740b898f3d2f46bf.zip SCons-2e0de3c55f22b3eaa7767b69740b898f3d2f46bf.tar.gz SCons-2e0de3c55f22b3eaa7767b69740b898f3d2f46bf.tar.bz2 | |
Support python 2 print statements in SConscripts
This fixes a regression introduced in scons-3.0.0, where
SConscripts containing python 2 print statements would cause
syntax errors even when executing scons with python 2.7.
This ensures backward compatibility, allowing users to build
legacy code with scons-3.0.0 without having to patch it.
Diffstat (limited to 'src')
| -rw-r--r-- | src/CHANGES.txt | 3 | ||||
| -rw-r--r-- | src/engine/SCons/Script/SConscript.py | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 4b492e6..0e742ec 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -11,6 +11,9 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER - Whatever John Doe did. + From Thomas Berg: + - Fixed a regression in scons-3.0.0 where "from __future__ import print_function" was imposed + on the scope where SConstruct is executed, breaking existing builds using PY 2.7. RELEASE 3.0.0 - Mon, 18 Sep 2017 08:32:04 -0700 diff --git a/src/engine/SCons/Script/SConscript.py b/src/engine/SCons/Script/SConscript.py index 558e28f..8fea9c4 100644 --- a/src/engine/SCons/Script/SConscript.py +++ b/src/engine/SCons/Script/SConscript.py @@ -5,8 +5,6 @@ files. """ -from __future__ import print_function - # # __COPYRIGHT__ # |