diff options
| author | William Deegan <bill@baddogconsulting.com> | 2017-03-13 15:02:49 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2017-03-13 15:02:49 (GMT) |
| commit | 3fbb32bee52efaafff0109ade4533ea84b194eec (patch) | |
| tree | 1d0f23412abf8dcf38513c54410a3bf78ba4f54e /src | |
| parent | 9d977ce28597968f92929d708d56b10a58a35041 (diff) | |
| parent | 5c8b6da1dbbe718939c70dc926cb160f758ed9f7 (diff) | |
| download | SCons-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')
| -rw-r--r-- | src/engine/SCons/Variables/VariablesTests.py | 2 | ||||
| -rw-r--r-- | src/engine/SCons/Variables/__init__.py | 2 | ||||
| -rw-r--r-- | src/script/scons-time.py | 10 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/engine/SCons/Variables/VariablesTests.py b/src/engine/SCons/Variables/VariablesTests.py index 69f1e01..7ee66ca 100644 --- a/src/engine/SCons/Variables/VariablesTests.py +++ b/src/engine/SCons/Variables/VariablesTests.py @@ -65,7 +65,7 @@ def check(key, value, env): def checkSave(file, expected): gdict = {} ldict = {} - exec(open(file, 'rU').read(), gdict, ldict) + exec(open(file, 'r').read(), gdict, ldict) assert expected == ldict, "%s\n...not equal to...\n%s" % (expected, ldict) class VariablesTestCase(unittest.TestCase): diff --git a/src/engine/SCons/Variables/__init__.py b/src/engine/SCons/Variables/__init__.py index b03e5b5..cd66604 100644 --- a/src/engine/SCons/Variables/__init__.py +++ b/src/engine/SCons/Variables/__init__.py @@ -175,7 +175,7 @@ class Variables(object): sys.path.insert(0, dir) try: values['__name__'] = filename - exec(open(filename, 'rU').read(), {}, values) + exec(open(filename, 'r').read(), {}, values) finally: if dir: del sys.path[0] 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) |