[py3k] explicitly build a list around dict methods

When we modify the return value from one of the dict methods, explicitly
build a list from it to make things work on python3.  Related to #265740.

5 files changed, 5 insertions, 5 deletions

diff --git a/configuration.py b/configuration.py
index ff98f58..a628ce8 100644
--- a/configuration.py
+++ b/configuration.py
@@ -533,7 +533,7 @@ class OptionsManagerMixIn(object):
             args.append('-' + optdict['short'])
             del optdict['short']
         # cleanup option definition dict before giving it to optik
-        for key in optdict.keys():
+        for key in list(optdict.keys()):
             if not key in self._optik_option_attrs:
                 optdict.pop(key)
         return args, optdict
diff --git a/modutils.py b/modutils.py
index bff0c91..ec7370e 100644
--- a/modutils.py
+++ b/modutils.py
@@ -457,7 +457,7 @@ def get_source_file(filename, include_no_ext=False):
 def cleanup_sys_modules(directories):
     """remove submodules of `directories` from `sys.modules`"""
     cleaned = []
-    for modname, module in sys.modules.items():
+    for modname, module in list(sys.modules.items()):
         modfile = getattr(module, '__file__', None)
         if modfile:
             for directory in directories:
diff --git a/pytest.py b/pytest.py
index 486d4fd..95e646a 100644
--- a/pytest.py
+++ b/pytest.py
@@ -309,7 +309,7 @@ def remove_local_modules_from_sys(testdir):
     we **have** to clean sys.modules to make sure the correct test_utils
     module is ran in B
     """
-    for modname, mod in sys.modules.items():
+    for modname, mod in list(sys.modules.items()):
         if mod is None:
             continue
         if not hasattr(mod, '__file__'):
diff --git a/test/unittest_modutils.py b/test/unittest_modutils.py
index dfbcf14..877d7b4 100644
--- a/test/unittest_modutils.py
+++ b/test/unittest_modutils.py
@@ -54,7 +54,7 @@ class ModuleFileTC(ModutilsTestCase):
 
     def setUp(self):
         super(ModuleFileTC, self).setUp()
-        for k in sys.path_importer_cache.keys():
+        for k in list(sys.path_importer_cache.keys()):
             if 'MyPyPa' in k:
                 del sys.path_importer_cache[k]
 
diff --git a/test/unittest_registry.py b/test/unittest_registry.py
index 3d5eb1c..d07c73e 100644
--- a/test/unittest_registry.py
+++ b/test/unittest_registry.py
@@ -179,7 +179,7 @@ class RegistryStoreTC(TestCase):
         with prepended_syspath(self.datadir):
             store.register_objects([self.datapath('regobjects.py'),
                                     self.datapath('regobjects2.py')])
-        self.assertEqual(['zereg'], store.keys())
+        self.assertEqual(['zereg'], list(store.keys()))
         self.assertEqual(set(('appobject1', 'appobject2', 'appobject3')),
                          set(store['zereg']))