PY3K + PEP8 fixes for remaining files

Signed-off-by: Sol Jerome <sol.jerome@gmail.com>

6 files changed, 96 insertions, 78 deletions

diff --git a/src/lib/Server/Core.py b/src/lib/Server/Core.py
index ac67b8a69..e82e05a89 100644
--- a/src/lib/Server/Core.py
+++ b/src/lib/Server/Core.py
@@ -16,6 +16,7 @@ import Bcfg2.Server.Plugins.Metadata
 
 logger = logging.getLogger('Bcfg2.Server.Core')
 
+
 def critical_error(operation):
     """Log and err, traceback and return an xmlrpc fault to client."""
     logger.error(operation, exc_info=1)
@@ -27,12 +28,16 @@ try:
 except:
     pass
 
+
 class CoreInitError(Exception):
     """This error is raised when the core cannot be initialized."""
     pass
 
+
 class Core(Component):
-    """The Core object is the container for all Bcfg2 Server logic and modules."""
+    """The Core object is the container for all
+    Bcfg2 Server logic and modules.
+    """
     name = 'bcfg2-server'
     implementation = 'bcfg2-server'
 
@@ -42,15 +47,16 @@ class Core(Component):
         Component.__init__(self)
         self.datastore = repo
         if filemonitor not in Bcfg2.Server.FileMonitor.available:
-            logger.error("File monitor driver %s not available; forcing to default" % filemonitor)
+            logger.error("File monitor driver %s not available; "
+                         "forcing to default" % filemonitor)
             filemonitor = 'default'
         try:
             self.fam = Bcfg2.Server.FileMonitor.available[filemonitor]()
         except IOError:
             logger.error("Failed to instantiate fam driver %s" % filemonitor,
                          exc_info=1)
-            raise CoreInitError, "failed to instantiate fam driver (used %s)" % \
-                  filemonitor
+            raise CoreInitError("failed to instantiate fam driver (used %s)" % \
+                                filemonitor)
         self.pubspace = {}
         self.cfile = cfile
         self.cron = {}
@@ -70,44 +76,43 @@ class Core(Component):
             if not plugin in self.plugins:
                 self.init_plugins(plugin)
         # Remove blacklisted plugins
-        for p, bl in self.plugin_blacklist.items():
+        for p, bl in list(self.plugin_blacklist.items()):
             if len(bl) > 0:
                 logger.error("The following plugins conflict with %s;"
                              "Unloading %s" % (p, bl))
             for plug in bl:
                 del self.plugins[plug]
         # This section loads the experimental plugins
-        expl = [plug for (name, plug) in self.plugins.iteritems()
+        expl = [plug for (name, plug) in list(self.plugins.items())
                 if plug.experimental]
         if expl:
             logger.info("Loading experimental plugin(s): %s" % \
                         (" ".join([x.name for x in expl])))
             logger.info("NOTE: Interfaces subject to change")
-        depr = [plug for (name, plug) in self.plugins.iteritems()
+        depr = [plug for (name, plug) in list(self.plugins.items())
                 if plug.deprecated]
         # This section loads the deprecated plugins
         if depr:
             logger.info("Loading deprecated plugin(s): %s" % \
                         (" ".join([x.name for x in depr])))
 
-
-        mlist = [p for p in self.plugins.values() if \
+        mlist = [p for p in list(self.plugins.values()) if \
                  isinstance(p, Bcfg2.Server.Plugin.Metadata)]
         if len(mlist) == 1:
             self.metadata = mlist[0]
         else:
             logger.error("No Metadata Plugin loaded; failed to instantiate Core")
-            raise CoreInitError, "No Metadata Plugin"
-        self.statistics = [plugin for plugin in self.plugins.values() if \
-                             isinstance(plugin, Bcfg2.Server.Plugin.Statistics)]
-        self.pull_sources = [plugin for plugin in self.statistics if \
-                             isinstance(plugin, Bcfg2.Server.Plugin.PullSource)]
-        self.generators = [plugin for plugin in self.plugins.values() if \
-                             isinstance(plugin, Bcfg2.Server.Plugin.Generator)]
-        self.structures = [plugin for plugin in self.plugins.values() if \
-                             isinstance(plugin, Bcfg2.Server.Plugin.Structure)]
-        self.connectors = [plugin for plugin in self.plugins.values() if \
-                           isinstance(plugin, Bcfg2.Server.Plugin.Connector)]
+            raise CoreInitError("No Metadata Plugin")
+        self.statistics = [plugin for plugin in list(self.plugins.values())
+                           if isinstance(plugin, Bcfg2.Server.Plugin.Statistics)]
+        self.pull_sources = [plugin for plugin in self.statistics
+                             if isinstance(plugin, Bcfg2.Server.Plugin.PullSource)]
+        self.generators = [plugin for plugin in list(self.plugins.values())
+                           if isinstance(plugin, Bcfg2.Server.Plugin.Generator)]
+        self.structures = [plugin for plugin in list(self.plugins.values())
+                           if isinstance(plugin, Bcfg2.Server.Plugin.Structure)]
+        self.connectors = [plugin for plugin in list(self.plugins.values())
+                           if isinstance(plugin, Bcfg2.Server.Plugin.Connector)]
         self.ca = ca
         self.fam_thread = threading.Thread(target=self._file_monitor_thread)
         if start_fam_thread:
@@ -128,7 +133,7 @@ class Core(Component):
             except:
                 continue
             # VCS plugin periodic updates
-            for plugin in self.plugins.values():
+            for plugin in list(self.plugins.values()):
                 if isinstance(plugin, Bcfg2.Server.Plugin.Version):
                     self.revision = plugin.get_revision()
 
@@ -157,15 +162,15 @@ class Core(Component):
                 (plugin), exc_info=1)
 
     def shutdown(self):
-        """Shuting down the plugins."""
+        """Shutting down the plugins."""
         if not self.terminate.isSet():
             self.terminate.set()
-            for plugin in self.plugins.values():
+            for plugin in list(self.plugins.values()):
                 plugin.shutdown()
 
     def validate_data(self, metadata, data, base_cls):
         """Checks the data structure."""
-        for plugin in self.plugins.values():
+        for plugin in list(self.plugins.values()):
             if isinstance(plugin, base_cls):
                 try:
                     if base_cls == Bcfg2.Server.Plugin.StructureValidator:
@@ -182,7 +187,7 @@ class Core(Component):
 
     def GetStructures(self, metadata):
         """Get all structures for client specified by metadata."""
-        structures = reduce(lambda x, y:x+y,
+        structures = reduce(lambda x, y: x + y,
                             [struct.BuildStructures(metadata) for struct \
                              in self.structures], [])
         sbundles = [b.get('name') for b in structures if b.tag == 'Bundle']
@@ -232,7 +237,8 @@ class Core(Component):
         glist = [gen for gen in self.generators if
                  entry.get('name') in gen.Entries.get(entry.tag, {})]
         if len(glist) == 1:
-            return glist[0].Entries[entry.tag][entry.get('name')](entry, metadata)
+            return glist[0].Entries[entry.tag][entry.get('name')](entry,
+                                                                  metadata)
         elif len(glist) > 1:
             generators = ", ".join([gen.name for gen in glist])
             logger.error("%s %s served by multiple generators: %s" % \
@@ -242,7 +248,7 @@ class Core(Component):
         if len(g2list) == 1:
             return g2list[0].HandleEntry(entry, metadata)
         entry.set('failure', 'no matching generator')
-        raise PluginExecutionError, (entry.tag, entry.get('name'))
+        raise PluginExecutionError(entry.tag, entry.get('name'))
 
     def BuildConfiguration(self, client):
         """Build configuration for clients."""
@@ -290,7 +296,7 @@ class Core(Component):
     def GetDecisions(self, metadata, mode):
         """Get data for the decision list."""
         result = []
-        for plugin in self.plugins.values():
+        for plugin in list(self.plugins.values()):
             try:
                 if isinstance(plugin, Bcfg2.Server.Plugin.Decision):
                     result += plugin.GetDecisions(metadata, mode)
@@ -300,7 +306,7 @@ class Core(Component):
         return result
 
     def build_metadata(self, client_name):
-        """Build the metadata structure."""		
+        """Build the metadata structure."""
         if not hasattr(self, 'metadata'):
             # some threads start before metadata is even loaded
             raise Bcfg2.Server.Plugins.Metadata.MetadataRuntimeError
diff --git a/src/lib/Server/FileMonitor.py b/src/lib/Server/FileMonitor.py
index 0f09f7751..d6b313e6b 100644
--- a/src/lib/Server/FileMonitor.py
+++ b/src/lib/Server/FileMonitor.py
@@ -7,6 +7,7 @@ from time import sleep, time
 
 logger = logging.getLogger('Bcfg2.Server.FileMonitor')
 
+
 def ShouldIgnore(event):
     """Test if the event should be suppresed."""
     # FIXME should move event suppression out of the core
@@ -18,6 +19,7 @@ def ShouldIgnore(event):
         return True
     return False
 
+
 class Event(object):
     def __init__(self, request_id, filename, code):
         self.requestID = request_id
@@ -29,6 +31,8 @@ class Event(object):
         return self.action
 
 available = {}
+
+
 class FileMonitor(object):
     """File Monitor baseclass."""
     def __init__(self, debug=False):
@@ -78,7 +82,7 @@ class FileMonitor(object):
         if lock:
             lock.release()
         end = time()
-        logger.info("Handled %d events in %.03fs" % (count, (end-start)))
+        logger.info("Handled %d events in %.03fs" % (count, (end - start)))
 
     def handle_events_in_interval(self, interval):
         end = time() + interval
@@ -91,7 +95,9 @@ class FileMonitor(object):
 
 
 class FamFam(object):
-    """The fam object is a set of callbacks for file alteration events (FAM support)."""
+    """The fam object is a set of callbacks for
+    file alteration events (FAM support).
+    """
 
     def __init__(self):
         object.__init__(self)
@@ -164,7 +170,6 @@ class FamFam(object):
         return count
 
 
-
 class Fam(FileMonitor):
     """
        The fam object is a set of callbacks for
@@ -195,6 +200,7 @@ class Fam(FileMonitor):
     def get_event(self):
         return self.fm.nextEvent()
 
+
 class Pseudo(FileMonitor):
     """
        The fam object is a set of callbacks for
@@ -213,14 +219,16 @@ class Pseudo(FileMonitor):
 
     def AddMonitor(self, path, obj):
         """add a monitor to path, installing a callback to obj.HandleEvent"""
-        handleID = len(self.handles.keys())
+        handleID = len(list(self.handles.keys()))
         mode = os.stat(path)[stat.ST_MODE]
         handle = Event(handleID, path, 'exists')
         if stat.S_ISDIR(mode):
             dirList = os.listdir(path)
             self.pending_events.append(handle)
             for includedFile in dirList:
-                self.pending_events.append(Event(handleID, includedFile, 'exists'))
+                self.pending_events.append(Event(handleID,
+                                                 includedFile,
+                                                 'exists'))
             self.pending_events.append(Event(handleID, path, 'endExist'))
         else:
             self.pending_events.append(Event(handleID, path, 'exists'))
diff --git a/src/lib/Server/Hostbase/ldapauth.py b/src/lib/Server/Hostbase/ldapauth.py
index f2148181f..21b462c86 100644
--- a/src/lib/Server/Hostbase/ldapauth.py
+++ b/src/lib/Server/Hostbase/ldapauth.py
@@ -1,16 +1,18 @@
-"""Checks with LDAP (ActiveDirectory) to see if the current user is an LDAP(AD) user,
-and returns a subset of the user's profile that is needed by Argonne/CIS to
-to set user level privleges in Django"""
-
-__revision__ = '$Revision: 2456 $'
+"""
+Checks with LDAP (ActiveDirectory) to see if the current user is an LDAP(AD)
+user, and returns a subset of the user's profile that is needed by Argonne/CIS
+to set user level privleges in Django
+"""
 
 import os
 import ldap
 
+
 class LDAPAUTHError(Exception):
     """LDAPAUTHError is raised when somehting goes boom."""
     pass
 
+
 class ldapauth(object):
     group_test = False
     check_member_of = os.environ['LDAP_CHECK_MBR_OF_GRP']
@@ -20,35 +22,35 @@ class ldapauth(object):
     telephoneNumber = None
     title = None
     memberOf = None
-    department = None #this will be a list
+    department = None  # this will be a list
     mail = None
-    extensionAttribute1 = None #badgenumber
+    extensionAttribute1 = None  # badgenumber
     badge_no = None
 
-    def __init__(self,login,passwd):
+    def __init__(self, login, passwd):
         """get username (if using ldap as auth the
         apache env var REMOTE_USER should be used)
         from username get user profile from AD/LDAP
         """
         #p = self.user_profile(login,passwd)
-        d = self.user_dn(login) #success, distname
-        print d[1]
+        d = self.user_dn(login)  # success, distname
+        print(d[1])
         if d[0] == 'success':
             pass
-            p = self.user_bind(d[1],passwd)
+            p = self.user_bind(d[1], passwd)
             if p[0] == 'success':
                 #parse results
                 parsed = self.parse_results(p[2])
-                print self.department
+                print(self.department)
                 self.group_test = self.member_of()
                 securitylevel = self.security_level()
-                print "ACCESS LEVEL: " + str(securitylevel)
+                print("ACCESS LEVEL: " + str(securitylevel))
             else:
                 raise LDAPAUTHError(p[2])
         else:
             raise LDAPAUTHError(p[2])
 
-    def user_profile(self,login,passwd=None):
+    def user_profile(self, login, passwd=None):
         """NOT USED RIGHT NOW"""
         ldap_login = "CN=%s" % login
         svc_acct = os.environ['LDAP_SVC_ACCT_NAME']
@@ -60,33 +62,35 @@ class ldapauth(object):
 
         try:
             conn = ldap.initialize(os.environ['LDAP_URI'])
-            conn.bind(svc_acct,svc_pass,ldap.AUTH_SIMPLE)
+            conn.bind(svc_acct, svc_pass, ldap.AUTH_SIMPLE)
             result_id = conn.search(search_pth,
-                                      ldap.SCOPE_SUBTREE,
-                                      ldap_login,None)
-            result_type,result_data = conn.result(result_id,0)
-            return ('success','User profile found',result_data,)
-        except ldap.LDAPError,e:
+                                    ldap.SCOPE_SUBTREE,
+                                    ldap_login,
+                                    None)
+            result_type, result_data = conn.result(result_id, 0)
+            return ('success', 'User profile found', result_data,)
+        except ldap.LDAPError, e:
             #connection failed
-            return ('error','LDAP connect failed',e,)
+            return ('error', 'LDAP connect failed', e,)
 
-    def user_bind(self,distinguishedName,passwd):
+    def user_bind(self, distinguishedName, passwd):
         """Binds to LDAP Server"""
         search_pth = os.environ['LDAP_SEARCH_PTH']
         try:
             conn = ldap.initialize(os.environ['LDAP_URI'])
-            conn.bind(distinguishedName,passwd,ldap.AUTH_SIMPLE)
+            conn.bind(distinguishedName, passwd, ldap.AUTH_SIMPLE)
             cn = distinguishedName.split(",")
             result_id = conn.search(search_pth,
-                                      ldap.SCOPE_SUBTREE,
-                                      cn[0],None)
-            result_type,result_data = conn.result(result_id,0)
-            return ('success','User profile found',result_data,)
-        except ldap.LDAPError,e:
+                                    ldap.SCOPE_SUBTREE,
+                                    cn[0],
+                                    None)
+            result_type, result_data = conn.result(result_id, 0)
+            return ('success', 'User profile found', result_data,)
+        except ldap.LDAPError, e:
             #connection failed
-            return ('error','LDAP connect failed',e,)
+            return ('error', 'LDAP connect failed', e,)
 
-    def user_dn(self,cn):
+    def user_dn(self, cn):
         """Uses Service Account to get distinguishedName"""
         ldap_login = "CN=%s" % cn
         svc_acct = os.environ['LDAP_SVC_ACCT_NAME']
@@ -95,19 +99,20 @@ class ldapauth(object):
 
         try:
             conn = ldap.initialize(os.environ['LDAP_URI'])
-            conn.bind(svc_acct,svc_pass,ldap.AUTH_SIMPLE)
+            conn.bind(svc_acct, svc_pass, ldap.AUTH_SIMPLE)
             result_id = conn.search(search_pth,
-                                      ldap.SCOPE_SUBTREE,
-                                      ldap_login,None)
-            result_type,result_data = conn.result(result_id,0)
+                                    ldap.SCOPE_SUBTREE,
+                                    ldap_login,
+                                    None)
+            result_type, result_data = conn.result(result_id, 0)
             raw_obj = result_data[0][1]
             distinguishedName = raw_obj['distinguishedName']
-            return ('success',distinguishedName[0],)
-        except ldap.LDAPError,e:
+            return ('success', distinguishedName[0],)
+        except ldap.LDAPError, e:
             #connection failed
-            return ('error','LDAP connect failed',e,)
+            return ('error', 'LDAP connect failed', e,)
 
-    def parse_results(self,user_obj):
+    def parse_results(self, user_obj):
         """Clean up the huge ugly object handed to us in the LDAP query"""
         #user_obj is a list formatted like this:
         #[('LDAP_DN',{user_dict},),]
@@ -169,4 +174,3 @@ class ldapauth(object):
                 level = 4
 
         return level
-
diff --git a/src/lib/Server/Plugin.py b/src/lib/Server/Plugin.py
index 5a6f3281b..ac9479d44 100644
--- a/src/lib/Server/Plugin.py
+++ b/src/lib/Server/Plugin.py
@@ -363,7 +363,7 @@ class DirectoryBacked(object):
         return self.entries[key]
 
     def __iter__(self):
-        return iter(self.entries.items())
+        return iter(list(self.entries.items()))
 
     def AddEntry(self, name):
         """Add new entry to data structures upon file creation."""
diff --git a/src/lib/Server/Plugins/Pkgmgr.py b/src/lib/Server/Plugins/Pkgmgr.py
index dc4a5f37f..b96e7ea7d 100644
--- a/src/lib/Server/Plugins/Pkgmgr.py
+++ b/src/lib/Server/Plugins/Pkgmgr.py
@@ -62,7 +62,7 @@ class PNode(Bcfg2.Server.Plugin.INode):
         if 'Package' not in pdict:
             pdict['Package'] = set()
         for child in data.getchildren():
-            for attr in [key for key in data.attrib.keys()
+            for attr in [key for key in list(data.attrib.keys())
                          if key != 'name' and key not in child.attrib]:
                 try:
                     child.set(attr, data.get(attr))
diff --git a/src/lib/Server/Reports/reports/models.py b/src/lib/Server/Reports/reports/models.py
index c2be40870..d94b2e1ba 100644
--- a/src/lib/Server/Reports/reports/models.py
+++ b/src/lib/Server/Reports/reports/models.py
@@ -48,7 +48,7 @@ class ClientManager(models.Manager):
         if timestamp == None:
             timestamp = datetime.now()
         elif not isinstance(timestamp, datetime):
-            raise ValueError, 'Expected a datetime object'
+            raise ValueError('Expected a datetime object')
         else:
             try:
                 timestamp = datetime(*strptime(timestamp,
@@ -113,7 +113,7 @@ class InteractiveManager(models.Manager):
         """
 
         if maxdate and not isinstance(maxdate, datetime):
-            raise ValueError, 'Expected a datetime object'
+            raise ValueError('Expected a datetime object')
         return self.filter(id__in=self.get_interaction_per_client_ids(maxdate, active_only))
 
     def get_interaction_per_client_ids(self, maxdate=None, active_only=True):
@@ -133,7 +133,7 @@ class InteractiveManager(models.Manager):
                     'as timer from reports_interaction'
         if maxdate:
             if not isinstance(maxdate, datetime):
-                raise ValueError, 'Expected a datetime object'
+                raise ValueError('Expected a datetime object')
             sql = sql + " where timestamp <= '%s' " % maxdate
             cfilter = "(expiration is null or expiration > '%s') and creation <= '%s'" % (maxdate, maxdate)
         sql = sql + ' GROUP BY client_id) x, reports_interaction where ' + \