Merge branch 'master' of github.com:solj/bcfg2

1 files changed, 5 insertions, 3 deletions

diff --git a/src/lib/Server/Plugins/Ohai.py b/src/lib/Server/Plugins/Ohai.py
index 0f7c7187f..6bd3edc34 100644
--- a/src/lib/Server/Plugins/Ohai.py
+++ b/src/lib/Server/Plugins/Ohai.py
@@ -37,12 +37,12 @@ class OhaiCache(object):
             try:
                 data = open("%s/%s.json" % (self.dirname, item)).read()
             except:
-                raise KeyError, item
+                raise KeyError(item)
             self.cache[item] = json.loads(data)
         return self.cache[item]
 
     def __iter__(self):
-        data = self.cache.keys()
+        data = list(self.cache.keys())
         data.extend([x[:-5] for x in os.listdir(self.dirname)])
         return data.__iter__()
 
@@ -50,7 +50,9 @@ class OhaiCache(object):
 class Ohai(Bcfg2.Server.Plugin.Plugin,
            Bcfg2.Server.Plugin.Probing,
            Bcfg2.Server.Plugin.Connector):
-    """The Ohai plugin is used to detect information about the client operating system."""
+    """The Ohai plugin is used to detect information
+    about the client operating system.
+    """
     name = 'Ohai'
     experimental = True