fixed pylint/pep-8 tests

9 files changed, 25 insertions, 26 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