Result of raw 2to3 run (2to3-2.7); checkpoint for python3 conversion.

4 files changed, 20 insertions, 20 deletions

diff --git a/src/engine/SCons/Variables/EnumVariableTests.py b/src/engine/SCons/Variables/EnumVariableTests.py
index f4b600d..4feb712 100644
--- a/src/engine/SCons/Variables/EnumVariableTests.py
+++ b/src/engine/SCons/Variables/EnumVariableTests.py
@@ -122,7 +122,7 @@ class EnumVariableTestCase(unittest.TestCase):
             'C'     : ['C',     'three', 'three'],
         }
 
-        for k, l in table.items():
+        for k, l in list(table.items()):
             x = o0.converter(k)
             assert x == l[0], "o0 got %s, expected %s" % (x, l[0])
             x = o1.converter(k)
@@ -186,7 +186,7 @@ class EnumVariableTestCase(unittest.TestCase):
             'no_v'  : [invalid, invalid, invalid],
         }
 
-        for v, l in table.items():
+        for v, l in list(table.items()):
             l[0](o0, v)
             l[1](o1, v)
             l[2](o2, v)
diff --git a/src/engine/SCons/Variables/PathVariableTests.py b/src/engine/SCons/Variables/PathVariableTests.py
index 084154b..2fa46eb 100644
--- a/src/engine/SCons/Variables/PathVariableTests.py
+++ b/src/engine/SCons/Variables/PathVariableTests.py
@@ -65,7 +65,7 @@ class PathVariableTestCase(unittest.TestCase):
         dne = test.workpath('does_not_exist')
         try:
             o.validator('X', dne, {})
-        except SCons.Errors.UserError, e:
+        except SCons.Errors.UserError as e:
             assert str(e) == 'Path for option X does not exist: %s' % dne, e
         except:
             raise Exception("did not catch expected UserError")
@@ -89,7 +89,7 @@ class PathVariableTestCase(unittest.TestCase):
         f = test.workpath('file')
         try:
             o.validator('X', f, {})
-        except SCons.Errors.UserError, e:
+        except SCons.Errors.UserError as e:
             assert str(e) == 'Directory path for option X is a file: %s' % f, e
         except:
             raise Exception("did not catch expected UserError")
@@ -97,7 +97,7 @@ class PathVariableTestCase(unittest.TestCase):
         dne = test.workpath('does_not_exist')
         try:
             o.validator('X', dne, {})
-        except SCons.Errors.UserError, e:
+        except SCons.Errors.UserError as e:
             assert str(e) == 'Directory path for option X does not exist: %s' % dne, e
         except:
             raise Exception("did not catch expected UserError")
@@ -122,7 +122,7 @@ class PathVariableTestCase(unittest.TestCase):
         f = test.workpath('file')
         try:
             o.validator('X', f, {})
-        except SCons.Errors.UserError, e:
+        except SCons.Errors.UserError as e:
             assert str(e) == 'Path for option X is a file, not a directory: %s' % f, e
         except:
             raise Exception("did not catch expected UserError")
@@ -146,7 +146,7 @@ class PathVariableTestCase(unittest.TestCase):
         d = test.workpath('d')
         try:
             o.validator('X', d, {})
-        except SCons.Errors.UserError, e:
+        except SCons.Errors.UserError as e:
             assert str(e) == 'File path for option X does not exist: %s' % d, e
         except:
             raise Exception("did not catch expected UserError")
@@ -154,7 +154,7 @@ class PathVariableTestCase(unittest.TestCase):
         dne = test.workpath('does_not_exist')
         try:
             o.validator('X', dne, {})
-        except SCons.Errors.UserError, e:
+        except SCons.Errors.UserError as e:
             assert str(e) == 'File path for option X does not exist: %s' % dne, e
         except:
             raise Exception("did not catch expected UserError")
@@ -198,7 +198,7 @@ class PathVariableTestCase(unittest.TestCase):
         dne = test.workpath('does_not_exist')
         try:
             o.validator('X', dne, {})
-        except SCons.Errors.UserError, e:
+        except SCons.Errors.UserError as e:
             expect = 'Path for option X does not exist: %s' % dne
             assert str(e) == expect, e
         else:
@@ -217,7 +217,7 @@ class PathVariableTestCase(unittest.TestCase):
 
         try:
             o.validator('Y', 'value', {})
-        except Exception, e:
+        except Exception as e:
             assert str(e) == 'my_validator() got called for Y, value!', e
         else:
             raise Exception("did not catch expected exception from my_validator()")
diff --git a/src/engine/SCons/Variables/VariablesTests.py b/src/engine/SCons/Variables/VariablesTests.py
index ad46bd6..520c8e3 100644
--- a/src/engine/SCons/Variables/VariablesTests.py
+++ b/src/engine/SCons/Variables/VariablesTests.py
@@ -55,7 +55,7 @@ def check(key, value, env):
 def checkSave(file, expected):
     gdict = {}
     ldict = {}
-    exec open(file, 'rU').read() in gdict, ldict
+    exec(open(file, 'rU').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 ede7480..8d15b8d 100644
--- a/src/engine/SCons/Variables/__init__.py
+++ b/src/engine/SCons/Variables/__init__.py
@@ -36,11 +36,11 @@ import SCons.Errors
 import SCons.Util
 import SCons.Warnings
 
-from BoolVariable import BoolVariable  # okay
-from EnumVariable import EnumVariable  # okay
-from ListVariable import ListVariable  # naja
-from PackageVariable import PackageVariable # naja
-from PathVariable import PathVariable # okay
+from .BoolVariable import BoolVariable  # okay
+from .EnumVariable import EnumVariable  # okay
+from .ListVariable import ListVariable  # naja
+from .PackageVariable import PackageVariable # naja
+from .PathVariable import PathVariable # okay
 
 
 class Variables(object):
@@ -170,7 +170,7 @@ class Variables(object):
                     sys.path.insert(0, dir)
                 try:
                     values['__name__'] = filename
-                    exec open(filename, 'rU').read() in {}, values
+                    exec(open(filename, 'rU').read(), {}, values)
                 finally:
                     if dir:
                         del sys.path[0]
@@ -180,7 +180,7 @@ class Variables(object):
         if args is None:
             args = self.args
 
-        for arg, value in args.items():
+        for arg, value in list(args.items()):
             added = False
             for option in self.options:
                 if arg in list(option.aliases) + [ option.key ]:
@@ -206,7 +206,7 @@ class Variables(object):
                         env[option.key] = option.converter(value)
                     except TypeError:
                         env[option.key] = option.converter(value, env)
-                except ValueError, x:
+                except ValueError as x:
                     raise SCons.Errors.UserError('Error converting option: %s\n%s'%(option.key, x))
 
 
@@ -268,7 +268,7 @@ class Variables(object):
             finally:
                 fh.close()
 
-        except IOError, x:
+        except IOError as x:
             raise SCons.Errors.UserError('Error writing options to file: %s\n%s' % (filename, x))
 
     def GenerateHelpText(self, env, sort=None):