From fe2392ff6c5a6a4e6c4d49f2e61b36e4319465ba Mon Sep 17 00:00:00 2001
From: Chris Lumens <clumens@redhat.com>
Date: Mon, 6 Oct 2014 14:22:35 -0400
Subject: [PATCH] Apply a couple more 2to3 fixes, still avoiding the hard
 ones.(#985310).

---
 pykickstart/base.py    | 12 ++++++------
 pykickstart/version.py |  4 ++--
 tests/version.py       |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pykickstart/base.py b/pykickstart/base.py
index 71beb6e..b2c92c1 100644
--- a/pykickstart/base.py
+++ b/pykickstart/base.py
@@ -350,13 +350,13 @@ class BaseHandler(KickstartObject):
         else:
             dMap = dataMapping
 
-        if type(commandUpdates) == types.DictType:
+        if type(commandUpdates) == dict:
             cMap.update(commandUpdates)
 
-        if type(dataUpdates) == types.DictType:
+        if type(dataUpdates) == dict:
             dMap.update(dataUpdates)
 
-        for (cmdName, cmdClass) in cMap.items():
+        for (cmdName, cmdClass) in list(cMap.items()):
             # First make sure we haven't instantiated this command handler
             # already.  If we have, we just need to make another mapping to
             # it in self.commands.
@@ -365,7 +365,7 @@ class BaseHandler(KickstartObject):
             # these two code blocks in sync.
             cmdObj = None
 
-            for (_key, val) in self.commands.items():
+            for (_key, val) in list(self.commands.items()):
                 if val.__class__.__name__ == cmdClass.__name__:
                     cmdObj = val
                     break
@@ -382,7 +382,7 @@ class BaseHandler(KickstartObject):
         # We also need to create attributes for the various data objects.
         # No checks here because dMap is a bijection.  At least, that's what
         # the comment says.  Hope no one screws that up.
-        for (dataName, dataClass) in dMap.items():
+        for (dataName, dataClass) in list(dMap.items()):
             setattr(self, dataName, dataClass)
 
     def resetCommand(self, cmdName):
@@ -437,7 +437,7 @@ class BaseHandler(KickstartObject):
         """
         self._writeOrder = {}
 
-        for (key, _val) in self.commands.items():
+        for (key, _val) in list(self.commands.items()):
             if not key in lst:
                 self.commands[key] = None
 
diff --git a/pykickstart/version.py b/pykickstart/version.py
index 5b58a83..85562d4 100644
--- a/pykickstart/version.py
+++ b/pykickstart/version.py
@@ -133,7 +133,7 @@ def versionToString(version, skipDevel=False):
     if not skipDevel and version == versionMap["DEVEL"]:
         return "DEVEL"
 
-    for (key, val) in versionMap.items():
+    for (key, val) in list(versionMap.items()):
         if key == "DEVEL":
             continue
         elif val == version:
@@ -189,7 +189,7 @@ def returnClassForVersion(version=DEVEL):
         found = imputil.imp.find_module(module)
         loaded = imputil.imp.load_module(module, found[0], found[1], found[2])
 
-        for (k, v) in loaded.__dict__.items():
+        for (k, v) in list(loaded.__dict__.items()):
             if k.lower().endswith("%shandler" % module):
                 return v
     except:
diff --git a/tests/version.py b/tests/version.py
index 90f2199..b20c3cb 100644
--- a/tests/version.py
+++ b/tests/version.py
@@ -200,7 +200,7 @@ class returnClassForVersion_TestCase(CommandTest):
 
         # Test that everything in version.versionMap has a handler, except
         # for DEVEL.
-        for (name, vers) in versionMap.items():
+        for (name, vers) in list(versionMap.items()):
             if name == "DEVEL":
                 continue
 
-- 
2.11.4.GIT