diff options
| author | Greg Noel <GregNoel@tigris.org> | 2009-03-08 00:51:26 (GMT) |
|---|---|---|
| committer | Greg Noel <GregNoel@tigris.org> | 2009-03-08 00:51:26 (GMT) |
| commit | 7f380de2d31a8ca288bd8a44a51de8f2867830be (patch) | |
| tree | beffc7420a3c8681158aeefa6b82628fa7121aca /src/script | |
| parent | 4993b28ca2ef767ede531e21450f390683da6b66 (diff) | |
| download | SCons-7f380de2d31a8ca288bd8a44a51de8f2867830be.zip SCons-7f380de2d31a8ca288bd8a44a51de8f2867830be.tar.gz SCons-7f380de2d31a8ca288bd8a44a51de8f2867830be.tar.bz2 | |
Issue 2326, change execfile() to exec ... (FIXED)
Diffstat (limited to 'src/script')
| -rw-r--r-- | src/script/scons-time.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/script/scons-time.py b/src/script/scons-time.py index 019df31..6e18892 100644 --- a/src/script/scons-time.py +++ b/src/script/scons-time.py @@ -841,7 +841,7 @@ class SConsTimer: self.title = a if self.config_file: - exec string.replace(open(self.config_file).read(), '\r', '\n') in self.__dict__ + exec open(self.config_file, 'rU').read() in self.__dict__ if self.chdir: os.chdir(self.chdir) @@ -960,7 +960,7 @@ class SConsTimer: self.title = a if self.config_file: - HACK_for_exec(string.replace(open(self.config_file).read(), '\r', '\n'), self.__dict__) + HACK_for_exec(open(self.config_file, 'rU').read(), self.__dict__) if self.chdir: os.chdir(self.chdir) @@ -1080,7 +1080,7 @@ class SConsTimer: object_name = args.pop(0) if self.config_file: - HACK_for_exec(string.replace(open(self.config_file).read(), '\r', '\n'), self.__dict__) + HACK_for_exec(open(self.config_file, 'rU').read(), self.__dict__) if self.chdir: os.chdir(self.chdir) @@ -1218,7 +1218,7 @@ class SConsTimer: sys.exit(1) if self.config_file: - exec string.replace(open(self.config_file).read(), '\r', '\n') in self.__dict__ + exec open(self.config_file, 'rU').read() in self.__dict__ if args: self.archive_list = args @@ -1458,7 +1458,7 @@ class SConsTimer: which = a if self.config_file: - HACK_for_exec(string.replace(open(self.config_file).read(), '\r', '\n'), self.__dict__) + HACK_for_exec(open(self.config_file, 'rU').read(), self.__dict__) if self.chdir: os.chdir(self.chdir) |