Merged in rodrigc/scons (pull request #409)

Remove 'U' flag to open()

5 files changed, 9 insertions, 9 deletions

diff --git a/test/Deprecated/Options/Options.py b/test/Deprecated/Options/Options.py
index 2a2d26c..e415739 100644
--- a/test/Deprecated/Options/Options.py
+++ b/test/Deprecated/Options/Options.py
@@ -241,7 +241,7 @@ opts.Save('options.saved', 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)
 
 # First test with no command line options
diff --git a/test/Deprecated/Options/chdir.py b/test/Deprecated/Options/chdir.py
index 977a351..ed0aab1 100644
--- a/test/Deprecated/Options/chdir.py
+++ b/test/Deprecated/Options/chdir.py
@@ -52,7 +52,7 @@ print("VARIABLE =", repr(env['VARIABLE']))
 test.write(['bin', 'opts.cfg'], """\
 import os
 os.chdir(os.path.split(__name__)[0])
-exec(open('opts2.cfg', 'rU').read())
+exec(open('opts2.cfg', 'r').read())
 """)
 
 test.write(['bin', 'opts2.cfg'], """\
diff --git a/test/SConscript/SConscriptChdir.py b/test/SConscript/SConscriptChdir.py
index 4c55844..211d55b 100644
--- a/test/SConscript/SConscriptChdir.py
+++ b/test/SConscript/SConscriptChdir.py
@@ -44,27 +44,27 @@ SConscript('dir5/SConscript')
 """)
 
 test.write(['dir1', 'SConscript'], """
-exec(open("create_test.py", 'rU').read())
+exec(open("create_test.py", 'r').read())
 """)
 
 test.write(['dir2', 'SConscript'], """
-exec(open("create_test.py", 'rU').read())
+exec(open("create_test.py", 'r').read())
 """)
 
 test.write(['dir3', 'SConscript'], """
 import os.path
 name = os.path.join('dir3', 'create_test.py')
-exec(open(name, 'rU').read())
+exec(open(name, 'r').read())
 """)
 
 test.write(['dir4', 'SConscript'], """
-exec(open("create_test.py", 'rU').read())
+exec(open("create_test.py", 'r').read())
 """)
 
 test.write(['dir5', 'SConscript'], """
 import os.path
 name = os.path.join('dir5', 'create_test.py')
-exec(open(name, 'rU').read())
+exec(open(name, 'r').read())
 """)
 
 for dir in ['dir1', 'dir2', 'dir3','dir4', 'dir5']:
diff --git a/test/Variables/Variables.py b/test/Variables/Variables.py
index 2f4f69e..17b33af 100644
--- a/test/Variables/Variables.py
+++ b/test/Variables/Variables.py
@@ -231,7 +231,7 @@ opts.Save('variables.saved', 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)
 
 # First test with no command line variables
diff --git a/test/Variables/chdir.py b/test/Variables/chdir.py
index 2d097d5..0e9abaa 100644
--- a/test/Variables/chdir.py
+++ b/test/Variables/chdir.py
@@ -52,7 +52,7 @@ print("VARIABLE =", repr(env['VARIABLE']))
 test.write(['bin', 'opts.cfg'], """\
 import os
 os.chdir(os.path.split(__name__)[0])
-exec(open('opts2.cfg', 'rU').read())
+exec(open('opts2.cfg', 'r').read())
 """)
 
 test.write(['bin', 'opts2.cfg'], """\