diff options
author | William Deegan <bill@baddogconsulting.com> | 2016-05-09 04:23:37 (GMT) |
---|---|---|
committer | William Deegan <bill@baddogconsulting.com> | 2016-05-09 04:23:37 (GMT) |
commit | 70f4e3f26156b33f465fa12ec87b50c5b8f784e4 (patch) | |
tree | 56b6b29372e9057df9d6b944d508dde5c7236deb | |
parent | 36b38cccb12248c106575753a8f2807bfd88c2fa (diff) | |
download | SCons-70f4e3f26156b33f465fa12ec87b50c5b8f784e4.zip SCons-70f4e3f26156b33f465fa12ec87b50c5b8f784e4.tar.gz SCons-70f4e3f26156b33f465fa12ec87b50c5b8f784e4.tar.bz2 |
Add from future import print_function to fix broken tests under python2.7
-rw-r--r-- | src/engine/SCons/Script/Main.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/engine/SCons/Script/Main.py b/src/engine/SCons/Script/Main.py index 997d701..c0b22a7 100644 --- a/src/engine/SCons/Script/Main.py +++ b/src/engine/SCons/Script/Main.py @@ -10,9 +10,13 @@ some other module. If it's specific to the "scons" script invocation, it goes here. """ +from __future__ import print_function + + unsupported_python_version = (2, 6, 0) deprecated_python_version = (2, 7, 0) + # __COPYRIGHT__ # # Permission is hereby granted, free of charge, to any person obtaining @@ -36,6 +40,7 @@ deprecated_python_version = (2, 7, 0) __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" + import SCons.compat import os @@ -360,7 +365,7 @@ class CleanTask(SCons.Taskmaster.AlwaysTask): # the file not existing. In either case, print a # message and keep going to try to remove as many # targets as possible. - print(("scons: Could not remove '{}':".format(str(t)), e.strerror)) + print("scons: Could not remove '{0}'".format(str(t)), e.strerror) else: if removed: display("Removed " + str(t)) |