summaryrefslogtreecommitdiffstats
path: root/src/script
diff options
context:
space:
mode:
authorWilliam Deegan <bill@baddogconsulting.com>2017-03-13 15:02:49 (GMT)
committerWilliam Deegan <bill@baddogconsulting.com>2017-03-13 15:02:49 (GMT)
commit3fbb32bee52efaafff0109ade4533ea84b194eec (patch)
tree1d0f23412abf8dcf38513c54410a3bf78ba4f54e /src/script
parent9d977ce28597968f92929d708d56b10a58a35041 (diff)
parent5c8b6da1dbbe718939c70dc926cb160f758ed9f7 (diff)
downloadSCons-3fbb32bee52efaafff0109ade4533ea84b194eec.zip
SCons-3fbb32bee52efaafff0109ade4533ea84b194eec.tar.gz
SCons-3fbb32bee52efaafff0109ade4533ea84b194eec.tar.bz2
Merged in rodrigc/scons (pull request #409)
Remove 'U' flag to open()
Diffstat (limited to 'src/script')
-rw-r--r--src/script/scons-time.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/script/scons-time.py b/src/script/scons-time.py
index 1473c42..aa875f1 100644
--- a/src/script/scons-time.py
+++ b/src/script/scons-time.py
@@ -814,7 +814,7 @@ class SConsTimer(object):
self.title = a
if self.config_file:
- exec(open(self.config_file, 'rU').read(), self.__dict__)
+ exec(open(self.config_file, 'r').read(), self.__dict__)
if self.chdir:
os.chdir(self.chdir)
@@ -933,7 +933,7 @@ class SConsTimer(object):
self.title = a
if self.config_file:
- HACK_for_exec(open(self.config_file, 'rU').read(), self.__dict__)
+ HACK_for_exec(open(self.config_file, 'r').read(), self.__dict__)
if self.chdir:
os.chdir(self.chdir)
@@ -1053,7 +1053,7 @@ class SConsTimer(object):
object_name = args.pop(0)
if self.config_file:
- HACK_for_exec(open(self.config_file, 'rU').read(), self.__dict__)
+ HACK_for_exec(open(self.config_file, 'r').read(), self.__dict__)
if self.chdir:
os.chdir(self.chdir)
@@ -1191,7 +1191,7 @@ class SConsTimer(object):
sys.exit(1)
if self.config_file:
- exec(open(self.config_file, 'rU').read(), self.__dict__)
+ exec(open(self.config_file, 'r').read(), self.__dict__)
if args:
self.archive_list = args
@@ -1431,7 +1431,7 @@ class SConsTimer(object):
which = a
if self.config_file:
- HACK_for_exec(open(self.config_file, 'rU').read(), self.__dict__)
+ HACK_for_exec(open(self.config_file, 'r').read(), self.__dict__)
if self.chdir:
os.chdir(self.chdir)