testsuite: fixed issues found by latest version of pep8

15 files changed, 56 insertions, 55 deletions

diff --git a/src/lib/Bcfg2/Client/Client.py b/src/lib/Bcfg2/Client/Client.py
index 2df0b11cd..5633764a8 100644
--- a/src/lib/Bcfg2/Client/Client.py
+++ b/src/lib/Bcfg2/Client/Client.py
@@ -164,7 +164,8 @@ class Client(object):
         if len(probes.findall(".//probe")) > 0:
             try:
                 # upload probe responses
-                self.proxy.RecvProbeData(Bcfg2.Client.XML.tostring(
+                self.proxy.RecvProbeData(
+                    Bcfg2.Client.XML.tostring(
                         probedata,
                         xml_declaration=False).decode('UTF-8'))
             except Bcfg2.Proxy.ProxyError:
@@ -320,7 +321,8 @@ class Client(object):
             feedback = self.tools.GenerateStats()
 
             try:
-                self.proxy.RecvStats(Bcfg2.Client.XML.tostring(
+                self.proxy.RecvStats(
+                    Bcfg2.Client.XML.tostring(
                         feedback,
                         xml_declaration=False).decode('UTF-8'))
             except Bcfg2.Proxy.ProxyError:
diff --git a/src/lib/Bcfg2/Client/Frame.py b/src/lib/Bcfg2/Client/Frame.py
index bc6bd4d4c..ad5447736 100644
--- a/src/lib/Bcfg2/Client/Frame.py
+++ b/src/lib/Bcfg2/Client/Frame.py
@@ -61,8 +61,8 @@ class Frame(object):
         self.removal = []
         self.logger = logging.getLogger(__name__)
         for driver in drivers[:]:
-            if driver not in Bcfg2.Client.Tools.drivers and \
-                   isinstance(driver, str):
+            if (driver not in Bcfg2.Client.Tools.drivers and
+                isinstance(driver, str)):
                 self.logger.error("Tool driver %s is not available" % driver)
                 drivers.remove(driver)
 
@@ -128,7 +128,7 @@ class Frame(object):
                 if entry.tag == 'Package']
         if pkgs:
             self.logger.debug("The following packages are specified in bcfg2:")
-            self.logger.debug([pkg[0] for pkg in pkgs if pkg[1] == None])
+            self.logger.debug([pkg[0] for pkg in pkgs if pkg[1] is None])
             self.logger.debug("The following packages are prereqs added by "
                               "Packages:")
             self.logger.debug([pkg[0] for pkg in pkgs if pkg[1] == 'Packages'])
@@ -187,19 +187,19 @@ class Frame(object):
         """
         # Need to process decision stuff early so that dryrun mode
         # works with it
-        self.whitelist = [entry for entry in self.states \
+        self.whitelist = [entry for entry in self.states
                           if not self.states[entry]]
         if not self.setup['file']:
             if self.setup['decision'] == 'whitelist':
                 dwl = self.setup['decision_list']
-                w_to_rem = [e for e in self.whitelist \
+                w_to_rem = [e for e in self.whitelist
                             if not matches_white_list(e, dwl)]
                 if w_to_rem:
                     self.logger.info("In whitelist mode: "
                                      "suppressing installation of:")
                     self.logger.info(["%s:%s" % (e.tag, e.get('name'))
                                       for e in w_to_rem])
-                    self.whitelist = [x for x in self.whitelist \
+                    self.whitelist = [x for x in self.whitelist
                                       if x not in w_to_rem]
             elif self.setup['decision'] == 'blacklist':
                 b_to_rem = \
@@ -230,7 +230,7 @@ class Frame(object):
                         cfile not in self.whitelist):
                         continue
                     tools = [t for t in self.tools
-                            if t.handlesEntry(cfile) and t.canVerify(cfile)]
+                             if t.handlesEntry(cfile) and t.canVerify(cfile)]
                     if not tools:
                         continue
                     if (self.setup['interactive'] and not
@@ -321,7 +321,7 @@ class Frame(object):
                     if bundle not in all_bundle_names:
                         self.logger.info("Warning: Bundle %s not found" %
                                          bundle)
-            bundles = filter(lambda b:
+            bundles = filter(lambda b: \
                                  b.get('name') not in self.setup['skipbundle'],
                              bundles)
         if self.setup['skipindep']:
@@ -387,8 +387,8 @@ class Frame(object):
         """Install all entries."""
         self.DispatchInstallCalls(self.whitelist)
         mods = self.modified
-        mbundles = [struct for struct in self.config.findall('Bundle') if \
-                    [mod for mod in mods if mod in struct]]
+        mbundles = [struct for struct in self.config.findall('Bundle')
+                    if any(True for mod in mods if mod in struct)]
 
         if self.modified:
             # Handle Bundle interdeps
@@ -403,19 +403,19 @@ class Frame(object):
                     self.logger.error("%s.Inventory() call failed:" %
                                       tool.name,
                                       exc_info=1)
-            clobbered = [entry for bundle in mbundles for entry in bundle \
+            clobbered = [entry for bundle in mbundles for entry in bundle
                          if (not self.states[entry] and
                              entry not in self.blacklist)]
             if clobbered:
                 self.logger.debug("Found clobbered entries:")
-                self.logger.debug(["%s:%s" % (entry.tag, entry.get('name')) \
+                self.logger.debug(["%s:%s" % (entry.tag, entry.get('name'))
                                    for entry in clobbered])
                 if not self.setup['interactive']:
                     self.DispatchInstallCalls(clobbered)
 
         for bundle in self.config.findall('.//Bundle'):
-            if self.setup['bundle'] and \
-                   bundle.get('name') not in self.setup['bundle']:
+            if (self.setup['bundle'] and
+                bundle.get('name') not in self.setup['bundle']):
                 # prune out unspecified bundles when running with -b
                 continue
             for tool in self.tools:
diff --git a/src/lib/Bcfg2/Client/Tools/APK.py b/src/lib/Bcfg2/Client/Tools/APK.py
index 8a02b7d6d..58641ed37 100644
--- a/src/lib/Bcfg2/Client/Tools/APK.py
+++ b/src/lib/Bcfg2/Client/Tools/APK.py
@@ -32,7 +32,7 @@ class APK(Bcfg2.Client.Tools.PkgTool):
         """Verify Package status for entry."""
         if not 'version' in entry.attrib:
             self.logger.info("Cannot verify unversioned package %s" %
-               (entry.attrib['name']))
+                             entry.attrib['name'])
             return False
 
         if entry.attrib['name'] in self.installed:
diff --git a/src/lib/Bcfg2/Client/Tools/Action.py b/src/lib/Bcfg2/Client/Tools/Action.py
index 87565d96d..da4412b1d 100644
--- a/src/lib/Bcfg2/Client/Tools/Action.py
+++ b/src/lib/Bcfg2/Client/Tools/Action.py
@@ -20,12 +20,12 @@ class Action(Bcfg2.Client.Tools.Tool):
         the whitelist or blacklist """
         if self.setup['decision'] == 'whitelist' and \
            not matches_white_list(action, self.setup['decision_list']):
-            self.logger.info("In whitelist mode: suppressing Action:" + \
+            self.logger.info("In whitelist mode: suppressing Action: %s" %
                              action.get('name'))
             return False
         if self.setup['decision'] == 'blacklist' and \
            not passes_black_list(action, self.setup['decision_list']):
-            self.logger.info("In blacklist mode: suppressing Action:" + \
+            self.logger.info("In blacklist mode: suppressing Action: %s" %
                              action.get('name'))
             return False
         return True
diff --git a/src/lib/Bcfg2/Client/Tools/FreeBSDPackage.py b/src/lib/Bcfg2/Client/Tools/FreeBSDPackage.py
index 635318805..395f56f6a 100644
--- a/src/lib/Bcfg2/Client/Tools/FreeBSDPackage.py
+++ b/src/lib/Bcfg2/Client/Tools/FreeBSDPackage.py
@@ -31,7 +31,7 @@ class FreeBSDPackage(Bcfg2.Client.Tools.PkgTool):
     def VerifyPackage(self, entry, _):
         if not 'version' in entry.attrib:
             self.logger.info("Cannot verify unversioned package %s" %
-               (entry.attrib['name']))
+                             entry.attrib['name'])
             return False
         if entry.attrib['name'] in self.installed:
             if self.installed[entry.attrib['name']] == entry.attrib['version']:
diff --git a/src/lib/Bcfg2/Client/Tools/IPS.py b/src/lib/Bcfg2/Client/Tools/IPS.py
index dc4d48235..aff276c3a 100644
--- a/src/lib/Bcfg2/Client/Tools/IPS.py
+++ b/src/lib/Bcfg2/Client/Tools/IPS.py
@@ -51,9 +51,9 @@ class IPS(Bcfg2.Client.Tools.PkgTool):
             pass
         else:
             if entry.get('version') != self.installed[pname]:
-                self.logger.debug("IPS: Package %s: have %s want %s" \
-                                  % (pname, self.installed[pname],
-                                     entry.get('version')))
+                self.logger.debug("IPS: Package %s: have %s want %s" %
+                                  (pname, self.installed[pname],
+                                   entry.get('version')))
                 return False
 
         # need to implement pkg chksum validation
diff --git a/src/lib/Bcfg2/Client/Tools/MacPorts.py b/src/lib/Bcfg2/Client/Tools/MacPorts.py
index bc3765ec6..bd9d24df3 100644
--- a/src/lib/Bcfg2/Client/Tools/MacPorts.py
+++ b/src/lib/Bcfg2/Client/Tools/MacPorts.py
@@ -38,7 +38,7 @@ class MacPorts(Bcfg2.Client.Tools.PkgTool):
         """Verify Package status for entry."""
         if not 'version' in entry.attrib:
             self.logger.info("Cannot verify unversioned package %s" %
-               (entry.attrib['name']))
+                             entry.attrib['name'])
             return False
 
         if entry.attrib['name'] in self.installed:
diff --git a/src/lib/Bcfg2/Client/Tools/POSIX/Device.py b/src/lib/Bcfg2/Client/Tools/POSIX/Device.py
index d5aaf069d..9b84adad0 100644
--- a/src/lib/Bcfg2/Client/Tools/POSIX/Device.py
+++ b/src/lib/Bcfg2/Client/Tools/POSIX/Device.py
@@ -12,8 +12,8 @@ class POSIXDevice(POSIXTool):
     def fully_specified(self, entry):
         if entry.get('dev_type') in ['block', 'char']:
             # check if major/minor are properly specified
-            if (entry.get('major') == None or
-                entry.get('minor') == None):
+            if (entry.get('major') is None or
+                entry.get('minor') is None):
                 return False
         return True
 
diff --git a/src/lib/Bcfg2/Client/Tools/POSIX/base.py b/src/lib/Bcfg2/Client/Tools/POSIX/base.py
index f46875743..11f331ddb 100644
--- a/src/lib/Bcfg2/Client/Tools/POSIX/base.py
+++ b/src/lib/Bcfg2/Client/Tools/POSIX/base.py
@@ -712,8 +712,8 @@ class POSIXTool(Bcfg2.Client.Tools.Tool):
         tmpentry.set('mode', oct_mode(newmode))
         for acl in tmpentry.findall('ACL'):
             acl.set('perms',
-                    oct_mode(self._norm_acl_perms(acl.get('perms')) | \
-                                 ACL_MAP['x']))
+                    oct_mode(self._norm_acl_perms(acl.get('perms')) |
+                             ACL_MAP['x']))
         for cpath in created:
             rv &= self._set_perms(tmpentry, path=cpath)
         return rv
diff --git a/src/lib/Bcfg2/Client/Tools/Pacman.py b/src/lib/Bcfg2/Client/Tools/Pacman.py
index 12785afee..be6698e18 100644
--- a/src/lib/Bcfg2/Client/Tools/Pacman.py
+++ b/src/lib/Bcfg2/Client/Tools/Pacman.py
@@ -30,12 +30,12 @@ class Pacman(Bcfg2.Client.Tools.PkgTool):
     def VerifyPackage(self, entry, _):
         '''Verify Package status for entry'''
 
-        self.logger.info("VerifyPackage : %s : %s" % entry.get('name'),
-                                                     entry.get('version'))
+        self.logger.info("VerifyPackage: %s : %s" % (entry.get('name'),
+                                                      entry.get('version')))
 
         if not 'version' in entry.attrib:
             self.logger.info("Cannot verify unversioned package %s" %
-               (entry.attrib['name']))
+                             entry.attrib['name'])
             return False
 
         if entry.attrib['name'] in self.installed:
diff --git a/src/lib/Bcfg2/Client/Tools/Portage.py b/src/lib/Bcfg2/Client/Tools/Portage.py
index 6b38d7dec..69d52b052 100644
--- a/src/lib/Bcfg2/Client/Tools/Portage.py
+++ b/src/lib/Bcfg2/Client/Tools/Portage.py
@@ -13,8 +13,8 @@ class Portage(Bcfg2.Client.Tools.PkgTool):
     __req__ = {'Package': ['name', 'version']}
     pkgtype = 'ebuild'
     # requires a working PORTAGE_BINHOST in make.conf
-    _binpkgtool = ('emerge --getbinpkgonly %s', ('=%s-%s', \
-                                     ['name', 'version']))
+    _binpkgtool = ('emerge --getbinpkgonly %s', ('=%s-%s', ['name',
+                                                            'version']))
     pkgtool = ('emerge %s', ('=%s-%s', ['name', 'version']))
 
     def __init__(self, logger, cfg, setup):
diff --git a/src/lib/Bcfg2/Client/Tools/SELinux.py b/src/lib/Bcfg2/Client/Tools/SELinux.py
index 451495be2..f277cb0c8 100644
--- a/src/lib/Bcfg2/Client/Tools/SELinux.py
+++ b/src/lib/Bcfg2/Client/Tools/SELinux.py
@@ -512,14 +512,14 @@ class SELinuxSefcontextHandler(SELinuxEntryHandler):
                         char="-c",
                         door="-D")
     filetypenames = dict(all="all files",
-                        regular="regular file",
-                        directory="directory",
-                        symlink="symbolic link",
-                        pipe="named pipe",
-                        socket="socket",
-                        block="block device",
-                        char="character device",
-                        door="door")
+                         regular="regular file",
+                         directory="directory",
+                         symlink="symbolic link",
+                         pipe="named pipe",
+                         socket="socket",
+                         block="block device",
+                         char="character device",
+                         door="door")
     filetypeattrs = dict([v, k] for k, v in filetypenames.iteritems())
     custom_re = re.compile(r'-f \'(?P<filetype>[a-z ]+)\'.*? \'(?P<name>.*)\'')
 
diff --git a/src/lib/Bcfg2/Client/Tools/SMF.py b/src/lib/Bcfg2/Client/Tools/SMF.py
index 68d8b2965..32a3df2f5 100644
--- a/src/lib/Bcfg2/Client/Tools/SMF.py
+++ b/src/lib/Bcfg2/Client/Tools/SMF.py
@@ -48,12 +48,12 @@ class SMF(Bcfg2.Client.Tools.SvcTool):
             gname = "/etc/rc*.d/%s" % filename
             files = glob.glob(gname.replace('_', '.'))
             if files:
-                self.logger.debug("Matched %s with %s" % \
+                self.logger.debug("Matched %s with %s" %
                                   (entry.get("FMRI"), ":".join(files)))
                 return entry.get('status') == 'on'
             else:
-                self.logger.debug("No service matching %s" % \
-                                  (entry.get("FMRI")))
+                self.logger.debug("No service matching %s" %
+                                  entry.get("FMRI"))
                 return entry.get('status') == 'off'
         try:
             srvdata = \
@@ -81,8 +81,7 @@ class SMF(Bcfg2.Client.Tools.SvcTool):
                     os.rename(loc, loc.replace('/S', '/DISABLED.S'))
                     return True
                 except OSError:
-                    self.logger.error("Failed to rename init script %s" % \
-                                      (loc))
+                    self.logger.error("Failed to rename init script %s" % loc)
                     return False
             else:
                 return self.cmd.run("/usr/sbin/svcadm disable %s" %
@@ -118,12 +117,12 @@ class SMF(Bcfg2.Client.Tools.SvcTool):
 
     def FindExtra(self):
         """Find Extra SMF Services."""
-        allsrv = [name for name, version in \
-                  [srvc.split()
-                   for srvc in self.cmd.run([
-                        "/usr/bin/svcs", "-a", "-H",
-                        "-o", "FMRI,STATE"]).stdout.splitlines()]
-                  if version != 'disabled']
+        allsrv = []
+        for srvc in self.cmd.run(["/usr/bin/svcs", "-a", "-H",
+                                  "-o", "FMRI,STATE"]).stdout.splitlines():
+            name, version = srvc.split()
+            if version != 'disabled':
+                allsrv.append(name)
 
         for svc in self.getSupportedEntries():
             if svc.get("FMRI") in allsrv:
diff --git a/src/lib/Bcfg2/Client/Tools/SYSV.py b/src/lib/Bcfg2/Client/Tools/SYSV.py
index 38072c52e..aca7d593c 100644
--- a/src/lib/Bcfg2/Client/Tools/SYSV.py
+++ b/src/lib/Bcfg2/Client/Tools/SYSV.py
@@ -41,7 +41,7 @@ class SYSV(Bcfg2.Client.Tools.PkgTool):
             self.noaskfile.write(noask)
             # flush admin file contents to disk
             self.noaskfile.flush()
-            self.pkgtool = (self.pkgtool[0] % ("-a %s" % (self.noaskname)), \
+            self.pkgtool = (self.pkgtool[0] % ("-a %s" % (self.noaskname)),
                             self.pkgtool[1])
         except:  # pylint: disable=W0702
             self.pkgtool = (self.pkgtool[0] % "", self.pkgtool[1])
@@ -66,7 +66,7 @@ class SYSV(Bcfg2.Client.Tools.PkgTool):
         desired_version = entry.get('version')
         if desired_version == 'any':
             desired_version = self.installed.get(entry.get('name'),
-                                                desired_version)
+                                                 desired_version)
 
         if not self.cmd.run(["/usr/bin/pkginfo", "-q", "-v",
                              desired_version, entry.get('name')]):
diff --git a/src/lib/Bcfg2/Client/Tools/Upstart.py b/src/lib/Bcfg2/Client/Tools/Upstart.py
index cd1c4a2bc..921ca849f 100644
--- a/src/lib/Bcfg2/Client/Tools/Upstart.py
+++ b/src/lib/Bcfg2/Client/Tools/Upstart.py
@@ -48,7 +48,7 @@ class Upstart(Bcfg2.Client.Tools.SvcTool):
 
         match = re.compile("%s( \(.*\))? (start|stop)/(running|waiting)" %
                            entry.get('name')).match(output)
-        if match == None:
+        if match is None:
             # service does not exist
             entry.set('current_status', 'off')
             status = False