update from upstream

2 files changed, 3 insertions, 3 deletions

diff --git a/src/engine/SCons/Variables/EnumVariableTests.py b/src/engine/SCons/Variables/EnumVariableTests.py
index 931dfe2..edc2973 100644
--- a/src/engine/SCons/Variables/EnumVariableTests.py
+++ b/src/engine/SCons/Variables/EnumVariableTests.py
@@ -124,7 +124,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)
@@ -188,7 +188,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/__init__.py b/src/engine/SCons/Variables/__init__.py
index b03e5b5..ce3541c 100644
--- a/src/engine/SCons/Variables/__init__.py
+++ b/src/engine/SCons/Variables/__init__.py
@@ -185,7 +185,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 ]: