From dd28e90f183972cc2a395094ce3e3f72e861953f Mon Sep 17 00:00:00 2001
From: "Chris St. Pierre" <chris.a.st.pierre@gmail.com>
Date: Fri, 21 Sep 2012 13:55:05 -0400
Subject: run pylint for errors on almost everything, full runs on some
 selected stuff

---
 src/sbin/bcfg2-info       | 54 ++++++++++++++++++++++++-----------------------
 src/sbin/bcfg2-lint       |  6 +++---
 src/sbin/bcfg2-yum-helper |  2 ++
 3 files changed, 33 insertions(+), 29 deletions(-)

(limited to 'src/sbin')

diff --git a/src/sbin/bcfg2-info b/src/sbin/bcfg2-info
index 95a18b608..44379ee89 100755
--- a/src/sbin/bcfg2-info
+++ b/src/sbin/bcfg2-info
@@ -98,29 +98,6 @@ class FileNotBuilt(Exception):
         return repr(self.value)
 
 
-def getClientList(hostglobs):
-    """ given a host glob, get a list of clients that match it """
-    # special cases to speed things up:
-    if '*' in hostglobs:
-        return self.metadata.clients
-    has_wildcards = False
-    for glob in hostglobs:
-        # check if any wildcard characters are in the string
-        if set('*?[]') & set(glob):
-            has_wildcards = True
-            break
-    if not has_wildcards:
-        return hostglobs
-
-    rv = set()
-    clist = set(self.metadata.clients)
-    for glob in hostglobs:
-        for client in clist:
-            if fnmatch.fnmatch(client, glob):
-                rv.update(client)
-        clist.difference_update(rv)
-    return list(rv)
-
 def printTabular(rows):
     """Print data in tabular format."""
     cmax = tuple([max([len(str(row[index])) for row in rows]) + 1 \
@@ -153,6 +130,7 @@ def load_interpreters():
         # before --interpreter was added, so we call IPython
         # better
         import IPython
+        # pylint: disable=E1101
         if hasattr(IPython, "Shell"):
             interpreters["ipython"] = lambda v: \
                 IPython.Shell.IPShell(argv=[], user_ns=v).mainloop()
@@ -162,6 +140,7 @@ def load_interpreters():
             best = "ipython"
         else:
             print("Unknown IPython API version")
+        # pylint: enable=E1101
     except ImportError:
         pass
 
@@ -178,6 +157,29 @@ class infoCore(cmd.Cmd, Bcfg2.Server.Core.BaseCore):
         self.cont = True
         self.fam.handle_events_in_interval(4)
 
+    def _get_client_list(self, hostglobs):
+        """ given a host glob, get a list of clients that match it """
+        # special cases to speed things up:
+        if '*' in hostglobs:
+            return self.metadata.clients
+        has_wildcards = False
+        for glob in hostglobs:
+            # check if any wildcard characters are in the string
+            if set('*?[]') & set(glob):
+                has_wildcards = True
+                break
+        if not has_wildcards:
+            return hostglobs
+
+        rv = set()
+        clist = set(self.metadata.clients)
+        for glob in hostglobs:
+            for client in clist:
+                if fnmatch.fnmatch(client, glob):
+                    rv.update(client)
+            clist.difference_update(rv)
+        return list(rv)
+
     def do_loop(self):
         """Looping."""
         self.cont = True
@@ -227,7 +229,7 @@ class infoCore(cmd.Cmd, Bcfg2.Server.Core.BaseCore):
             else:
                 logger.error("Invalid interpreter %s" % setup['interpreter'])
                 logger.error("Valid interpreters are: %s" %
-                             ", ".join(interpeters.keys()))
+                             ", ".join(interpreters.keys()))
 
     def do_quit(self, _):
         """
@@ -318,7 +320,7 @@ class infoCore(cmd.Cmd, Bcfg2.Server.Core.BaseCore):
             if err.errno != 17:
                 print("Could not create %s: %s" % (destdir, err))
         if len(alist) > 1:
-            clients = getClientList(alist[1:])
+            clients = self._get_client_list(alist[1:])
         else:
             clients = self.metadata.clients
         for client in clients:
@@ -350,7 +352,7 @@ class infoCore(cmd.Cmd, Bcfg2.Server.Core.BaseCore):
             if err.errno != 17:
                 print("Could not create %s: %s" % (destdir, err))
         if len(args) > 2:
-            clients = getClientList(args[1:])
+            clients = self._get_client_list(args[1:])
         else:
             clients = self.metadata.clients
         if altsrc:
diff --git a/src/sbin/bcfg2-lint b/src/sbin/bcfg2-lint
index 0e9a32e49..f1f91b7f4 100755
--- a/src/sbin/bcfg2-lint
+++ b/src/sbin/bcfg2-lint
@@ -122,11 +122,11 @@ if __name__ == '__main__':
                                 obj_name=plugin + "Lint")
             except (ImportError, AttributeError):
                  err = sys.exc_info()[1]
-                 logger.error("Failed to load plugin %s: %s" % (plugin + "Lint",
-                                                                err))
+                 logger.error("Failed to load plugin %s: %s" %
+                              (plugin + "Lint", err))
         except AttributeError:
             err = sys.exc_info()[1]
-            logger.error("Failed to load plugin %s: %s" % (obj_name, err))
+            logger.error("Failed to load plugin %s: %s" % (plugin, err))
             
     serverplugins = dict()
     serverlessplugins = dict()
diff --git a/src/sbin/bcfg2-yum-helper b/src/sbin/bcfg2-yum-helper
index a9c620496..07f9b81b0 100755
--- a/src/sbin/bcfg2-yum-helper
+++ b/src/sbin/bcfg2-yum-helper
@@ -61,12 +61,14 @@ class DepSolver(object):
     def __init__(self, cfgfile, verbose=1):
         self.cfgfile = cfgfile
         self.yumbase = yum.YumBase()
+        # pylint: disable=E1121
         try:
             self.yumbase.preconf.debuglevel = verbose
             self.yumbase.preconf.fn = cfgfile
             self.yumbase._getConfig()
         except AttributeError:
             self.yumbase._getConfig(cfgfile, debuglevel=verbose)
+        # pylint: enable=E1121
         self.logger = get_logger(verbose)
 
     def get_groups(self):
-- 
cgit v1.2.3-1-g7c22