fixed pylint/pep-8 tests

18 files changed, 48 insertions, 51 deletions

diff --git a/src/lib/Bcfg2/Client/Client.py b/src/lib/Bcfg2/Client/Client.py
index 1676ee717..14fe6768a 100644
--- a/src/lib/Bcfg2/Client/Client.py
+++ b/src/lib/Bcfg2/Client/Client.py
@@ -294,7 +294,7 @@ class Client(object):
                                               self.setup['dryrun'])
 
         if not self.setup['omit_lock_check']:
-            #check lock here
+            # check lock here
             try:
                 lockfile = open(self.setup['lockfile'], 'w')
                 if locked(lockfile.fileno()):
diff --git a/src/lib/Bcfg2/Client/Tools/APK.py b/src/lib/Bcfg2/Client/Tools/APK.py
index 58641ed37..eb70fa676 100644
--- a/src/lib/Bcfg2/Client/Tools/APK.py
+++ b/src/lib/Bcfg2/Client/Tools/APK.py
@@ -30,7 +30,7 @@ class APK(Bcfg2.Client.Tools.PkgTool):
 
     def VerifyPackage(self, entry, _):
         """Verify Package status for entry."""
-        if not 'version' in entry.attrib:
+        if 'version' not in entry.attrib:
             self.logger.info("Cannot verify unversioned package %s" %
                              entry.attrib['name'])
             return False
@@ -38,9 +38,9 @@ class APK(Bcfg2.Client.Tools.PkgTool):
         if entry.attrib['name'] in self.installed:
             if entry.attrib['version'] in \
                     ['auto', self.installed[entry.attrib['name']]]:
-                #if not self.setup['quick'] and \
-                #                entry.get('verify', 'true') == 'true':
-                #FIXME: Does APK have any sort of verification mechanism?
+                # if (not self.setup['quick'] and
+                #     entry.get('verify', 'true') == 'true'):
+                # FIXME: Does APK have any sort of verification mechanism?
                 return True
             else:
                 self.logger.info(" pkg %s at version %s, not %s" %
diff --git a/src/lib/Bcfg2/Client/Tools/FreeBSDPackage.py b/src/lib/Bcfg2/Client/Tools/FreeBSDPackage.py
index 31925fa3c..22cf802cf 100644
--- a/src/lib/Bcfg2/Client/Tools/FreeBSDPackage.py
+++ b/src/lib/Bcfg2/Client/Tools/FreeBSDPackage.py
@@ -29,7 +29,7 @@ class FreeBSDPackage(Bcfg2.Client.Tools.PkgTool):
                 self.installed[name] = version
 
     def VerifyPackage(self, entry, _):
-        if not 'version' in entry.attrib:
+        if 'version' not in entry.attrib:
             self.logger.info("Cannot verify unversioned package %s" %
                              entry.attrib['name'])
             return False
diff --git a/src/lib/Bcfg2/Client/Tools/IPS.py b/src/lib/Bcfg2/Client/Tools/IPS.py
index aff276c3a..5be8527bf 100644
--- a/src/lib/Bcfg2/Client/Tools/IPS.py
+++ b/src/lib/Bcfg2/Client/Tools/IPS.py
@@ -38,7 +38,7 @@ class IPS(Bcfg2.Client.Tools.PkgTool):
     def VerifyPackage(self, entry, _):
         """Verify package for entry."""
         pname = entry.get('name')
-        if not 'version' in entry.attrib:
+        if 'version' not in entry.attrib:
             self.logger.info("Cannot verify unversioned package %s" % (pname))
             return False
         if pname not in self.installed:
diff --git a/src/lib/Bcfg2/Client/Tools/MacPorts.py b/src/lib/Bcfg2/Client/Tools/MacPorts.py
index bd9d24df3..40d90eec9 100644
--- a/src/lib/Bcfg2/Client/Tools/MacPorts.py
+++ b/src/lib/Bcfg2/Client/Tools/MacPorts.py
@@ -36,7 +36,7 @@ class MacPorts(Bcfg2.Client.Tools.PkgTool):
 
     def VerifyPackage(self, entry, _):
         """Verify Package status for entry."""
-        if not 'version' in entry.attrib:
+        if 'version' not in entry.attrib:
             self.logger.info("Cannot verify unversioned package %s" %
                              entry.attrib['name'])
             return False
@@ -44,10 +44,10 @@ class MacPorts(Bcfg2.Client.Tools.PkgTool):
         if entry.attrib['name'] in self.installed:
             if (self.installed[entry.attrib['name']] == entry.attrib['version']
                 or entry.attrib['version'] == 'any'):
-                #if not self.setup['quick'] and \
-                #                entry.get('verify', 'true') == 'true':
-                #FIXME: We should be able to check this once
-                #       http://trac.macports.org/ticket/15709 is implemented
+                # if (not self.setup['quick'] and
+                #     entry.get('verify', 'true') == 'true'):
+                # FIXME: We should be able to check this once
+                #        http://trac.macports.org/ticket/15709 is implemented
                 return True
             else:
                 self.logger.info("  %s: Wrong version installed.  "
diff --git a/src/lib/Bcfg2/Client/Tools/Pacman.py b/src/lib/Bcfg2/Client/Tools/Pacman.py
index a4cfd3315..b931fe028 100644
--- a/src/lib/Bcfg2/Client/Tools/Pacman.py
+++ b/src/lib/Bcfg2/Client/Tools/Pacman.py
@@ -24,7 +24,6 @@ class Pacman(Bcfg2.Client.Tools.PkgTool):
         for pkg in self.cmd.run("/usr/bin/pacman -Q").stdout.splitlines():
             pkgname = pkg.split(' ')[0].strip()
             version = pkg.split(' ')[1].strip()
-            #self.logger.info(" pkgname: %s, version: %s" % (pkgname, version))
             self.installed[pkgname] = version
 
     def VerifyPackage(self, entry, _):
@@ -33,7 +32,7 @@ class Pacman(Bcfg2.Client.Tools.PkgTool):
         self.logger.info("VerifyPackage: %s : %s" % (entry.get('name'),
                                                      entry.get('version')))
 
-        if not 'version' in entry.attrib:
+        if 'version' not in entry.attrib:
             self.logger.info("Cannot verify unversioned package %s" %
                              entry.attrib['name'])
             return False
@@ -43,10 +42,10 @@ class Pacman(Bcfg2.Client.Tools.PkgTool):
                 return True
             elif self.installed[entry.attrib['name']] == \
                     entry.attrib['version']:
-                #if not self.setup['quick'] and \
-                #                entry.get('verify', 'true') == 'true':
-                #FIXME: need to figure out if pacman
-                #       allows you to verify packages
+                # if (not self.setup['quick'] and
+                #     entry.get('verify', 'true') == 'true'):
+                # FIXME: need to figure out if pacman
+                #        allows you to verify packages
                 return True
             else:
                 entry.set('current_version', self.installed[entry.get('name')])
diff --git a/src/lib/Bcfg2/Client/Tools/Portage.py b/src/lib/Bcfg2/Client/Tools/Portage.py
index 2d8b66ce5..78ccb2d37 100644
--- a/src/lib/Bcfg2/Client/Tools/Portage.py
+++ b/src/lib/Bcfg2/Client/Tools/Portage.py
@@ -48,7 +48,7 @@ class Portage(Bcfg2.Client.Tools.PkgTool):
 
     def VerifyPackage(self, entry, modlist):
         """Verify package for entry."""
-        if not 'version' in entry.attrib:
+        if 'version' not in entry.attrib:
             self.logger.info("Cannot verify unversioned package %s" %
                              (entry.get('name')))
             return False
@@ -66,11 +66,11 @@ class Portage(Bcfg2.Client.Tools.PkgTool):
             if ('verify' not in entry.attrib or
                 entry.get('verify').lower() == 'true'):
 
-            # Check the package if:
-            # - Not running in quick mode
-            # - No verify option is specified in the literal configuration
-            #    OR
-            # - Verify option is specified and is true
+                # Check the package if:
+                # - Not running in quick mode
+                # - No verify option is specified in the literal configuration
+                #    OR
+                # - Verify option is specified and is true
 
                 self.logger.debug('Running equery check on %s' %
                                   entry.get('name'))
diff --git a/src/lib/Bcfg2/Client/Tools/SMF.py b/src/lib/Bcfg2/Client/Tools/SMF.py
index 8b23a4a37..1a580d8a5 100644
--- a/src/lib/Bcfg2/Client/Tools/SMF.py
+++ b/src/lib/Bcfg2/Client/Tools/SMF.py
@@ -25,7 +25,7 @@ class SMF(Bcfg2.Client.Tools.SvcTool):
 
     def GetFMRI(self, entry):
         """Perform FMRI resolution for service."""
-        if not 'FMRI' in entry.attrib:
+        if 'FMRI' not in entry.attrib:
             rv = self.cmd.run(["/usr/bin/svcs", "-H", "-o", "FMRI",
                                entry.get('name')])
             if rv.success:
diff --git a/src/lib/Bcfg2/Client/Tools/YUM.py b/src/lib/Bcfg2/Client/Tools/YUM.py
index b4ca32847..15ae5ef8b 100644
--- a/src/lib/Bcfg2/Client/Tools/YUM.py
+++ b/src/lib/Bcfg2/Client/Tools/YUM.py
@@ -870,7 +870,7 @@ class YUM(Bcfg2.Client.Tools.PkgTool):
 
         cleanup()
 
-    def Install(self, packages, states):  # pylint: disable=R0912,R0914
+    def Install(self, packages, states):  # pylint: disable=R0912,R0914,R0915
         """ Try and fix everything that Yum.VerifyPackages() found
         wrong for each Package Entry.  This can result in individual
         RPMs being installed (for the first time), deleted, downgraded
diff --git a/src/lib/Bcfg2/Server/Admin/Minestruct.py b/src/lib/Bcfg2/Server/Admin/Minestruct.py
index 37ca74894..65f99a213 100644
--- a/src/lib/Bcfg2/Server/Admin/Minestruct.py
+++ b/src/lib/Bcfg2/Server/Admin/Minestruct.py
@@ -11,8 +11,8 @@ class Minestruct(Bcfg2.Server.Admin.StructureMode):
     __usage__ = ("[options] <client>\n\n"
                  "     %-25s%s\n"
                  "     %-25s%s\n" %
-                ("-f <filename>", "build a particular file",
-                 "-g <groups>", "only build config for groups"))
+                 ("-f <filename>", "build a particular file",
+                  "-g <groups>", "only build config for groups"))
 
     def __call__(self, args):
         if len(args) == 0:
diff --git a/src/lib/Bcfg2/Server/Admin/Pull.py b/src/lib/Bcfg2/Server/Admin/Pull.py
index 459fcec65..fccdb2d94 100644
--- a/src/lib/Bcfg2/Server/Admin/Pull.py
+++ b/src/lib/Bcfg2/Server/Admin/Pull.py
@@ -18,10 +18,10 @@ class Pull(Bcfg2.Server.Admin.MetadataCore):
                  "     %-25s%s\n"
                  "     %-25s%s\n"
                  "     %-25s%s\n" %
-                ("-v", "be verbose",
-                 "-f", "force",
-                 "-I", "interactive",
-                 "-s", "stdin"))
+                 ("-v", "be verbose",
+                  "-f", "force",
+                  "-I", "interactive",
+                  "-s", "stdin"))
 
     def __init__(self, setup):
         Bcfg2.Server.Admin.MetadataCore.__init__(self, setup)
diff --git a/src/lib/Bcfg2/Server/Admin/Viz.py b/src/lib/Bcfg2/Server/Admin/Viz.py
index 2cbd7eaf6..cb2470e17 100644
--- a/src/lib/Bcfg2/Server/Admin/Viz.py
+++ b/src/lib/Bcfg2/Server/Admin/Viz.py
@@ -14,16 +14,16 @@ class Viz(Bcfg2.Server.Admin.MetadataCore):
                  "     %-32s%s\n"
                  "     %-32s%s\n"
                  "     %-32s%s\n" %
-                ("-H, --includehosts",
-                 "include hosts in the viz output",
-                 "-b, --includebundles",
-                 "include bundles in the viz output",
-                 "-k, --includekey",
-                 "show a key for different digraph shapes",
-                 "-c, --only-client <clientname>",
-                 "show only the groups, bundles for the named client",
-                 "-o, --outfile <file>",
-                 "write viz output to an output file"))
+                 ("-H, --includehosts",
+                  "include hosts in the viz output",
+                  "-b, --includebundles",
+                  "include bundles in the viz output",
+                  "-k, --includekey",
+                  "show a key for different digraph shapes",
+                  "-c, --only-client <clientname>",
+                  "show only the groups, bundles for the named client",
+                  "-o, --outfile <file>",
+                  "write viz output to an output file"))
 
     colors = ['steelblue1', 'chartreuse', 'gold', 'magenta',
               'indianred1', 'limegreen', 'orange1', 'lightblue2',
diff --git a/src/lib/Bcfg2/Server/Core.py b/src/lib/Bcfg2/Server/Core.py
index 4375512e9..44ba0fee8 100644
--- a/src/lib/Bcfg2/Server/Core.py
+++ b/src/lib/Bcfg2/Server/Core.py
@@ -387,7 +387,7 @@ class BaseCore(object):
             self.setup['plugins'].remove('')
 
         for plugin in self.setup['plugins']:
-            if not plugin in self.plugins:
+            if plugin not in self.plugins:
                 self.init_plugin(plugin)
 
         # Remove blacklisted plugins
diff --git a/src/lib/Bcfg2/settings.py b/src/lib/Bcfg2/settings.py
index aa784336d..834b04d36 100644
--- a/src/lib/Bcfg2/settings.py
+++ b/src/lib/Bcfg2/settings.py
@@ -159,7 +159,7 @@ MEDIA_ROOT = ''
 # trailing slash.
 STATIC_URL = '/media/'
 
-#TODO - make this unique
+# TODO - make this unique
 # Make this unique, and don't share it with anybody.
 SECRET_KEY = 'eb5+y%oy-qx*2+62vv=gtnnxg1yig_odu0se5$h0hh#pc*lmo7'
 
@@ -183,7 +183,7 @@ else:
         'django.template.loaders.app_directories.Loader',
     )
 
-#TODO - review these.  auth and sessions aren't really used
+# TODO - review these.  auth and sessions aren't really used
 MIDDLEWARE_CLASSES = (
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
diff --git a/src/sbin/bcfg2-info b/src/sbin/bcfg2-info
index 6008f8896..a6c3149bc 100755
--- a/src/sbin/bcfg2-info
+++ b/src/sbin/bcfg2-info
@@ -438,8 +438,7 @@ Bcfg2 client itself.""")
         automatch = self.setup.cfp.getboolean("properties", "automatch",
                                               default=False)
         pfile = self.plugins['Properties'].entries[pname]
-        if (not force and
-            not automatch and
+        if (not force and not automatch and
             pfile.xdata.get("automatch", "false").lower() != "true"):
             print("Automatch not enabled on %s" % pname)
         else:
diff --git a/src/sbin/bcfg2-lint b/src/sbin/bcfg2-lint
index 9ceb1dd04..bb96c2023 100755
--- a/src/sbin/bcfg2-lint
+++ b/src/sbin/bcfg2-lint
@@ -4,7 +4,6 @@
 
 import sys
 import time
-import inspect
 import logging
 import Bcfg2.Logger
 import Bcfg2.Options
@@ -136,8 +135,7 @@ def load_plugins(setup):
     serverplugins = dict()
     serverlessplugins = dict()
     for plugin_name, plugin in allplugins.items():
-        if [c for c in inspect.getmro(plugin)
-            if c == Bcfg2.Server.Lint.ServerPlugin]:
+        if issubclass(plugin, Bcfg2.Server.Lint.ServerPlugin):
             serverplugins[plugin_name] = plugin
         else:
             serverlessplugins[plugin_name] = plugin
diff --git a/src/sbin/bcfg2-yum-helper b/src/sbin/bcfg2-yum-helper
index dc6a6cc0b..f2bdf2c97 100755
--- a/src/sbin/bcfg2-yum-helper
+++ b/src/sbin/bcfg2-yum-helper
@@ -67,6 +67,7 @@ class YumHelper(object):
         resolution. """
         self.yumbase.arch.setup_arch(arch=arch)
 
+
 class DepSolver(YumHelper):
     """ Yum dependency solver.  This is used for operations that only
     read from the yum cache, and thus operates in cacheonly mode. """
diff --git a/testsuite/Testsrc/test_code_checks.py b/testsuite/Testsrc/test_code_checks.py
index 98df358e7..c368d40ce 100644
--- a/testsuite/Testsrc/test_code_checks.py
+++ b/testsuite/Testsrc/test_code_checks.py
@@ -336,7 +336,7 @@ class TestPylint(CodeTestCase):
 
 class TestPEP8(CodeTestCase):
     __test__ = True
-    command = ["pep8", "--ignore=E125,E501"]
+    command = ["pep8", "--ignore=E125,E129,E501"]
 
     def _test_errors(self, files, extra_args=None):
         pass