diff options
Diffstat (limited to 'src/engine')
| -rw-r--r-- | src/engine/SCons/Variables/VariablesTests.py | 3 | ||||
| -rw-r--r-- | src/engine/SCons/Variables/__init__.py | 2 | ||||
| -rw-r--r-- | src/engine/SCons/compat/_scons_optparse.py | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/src/engine/SCons/Variables/VariablesTests.py b/src/engine/SCons/Variables/VariablesTests.py index f1caff7..7f49692 100644 --- a/src/engine/SCons/Variables/VariablesTests.py +++ b/src/engine/SCons/Variables/VariablesTests.py @@ -23,7 +23,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" -import string import sys import unittest import TestSCons @@ -54,7 +53,7 @@ def check(key, value, env): def checkSave(file, expected): gdict = {} ldict = {} - exec string.replace(open(file).read(), '\r', '\n') in gdict, ldict + exec open(file, 'rU').read() in 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 3cc6694..805471a 100644 --- a/src/engine/SCons/Variables/__init__.py +++ b/src/engine/SCons/Variables/__init__.py @@ -166,7 +166,7 @@ class Variables: sys.path.insert(0, dir) try: values['__name__'] = filename - exec string.replace(open(filename).read(), '\r', '\n') in {}, values + exec open(filename, 'rU').read() in {}, values finally: if dir: del sys.path[0] diff --git a/src/engine/SCons/compat/_scons_optparse.py b/src/engine/SCons/compat/_scons_optparse.py index 23f2ad3..219adba 100644 --- a/src/engine/SCons/compat/_scons_optparse.py +++ b/src/engine/SCons/compat/_scons_optparse.py @@ -920,7 +920,7 @@ class Values: def read_file(self, filename, mode="careful"): vars = {} - exec string.replace(open(filename).read(), '\r', '\n') in vars + exec open(filename, 'rU').read() in vars self._update(vars, mode) def ensure_value(self, attr, value): |