testsuite: fixed issues found by latest version of pylint

8 files changed, 16 insertions, 17 deletions

diff --git a/src/lib/Bcfg2/Client/Frame.py b/src/lib/Bcfg2/Client/Frame.py
index ad5447736..fe4943fdf 100644
--- a/src/lib/Bcfg2/Client/Frame.py
+++ b/src/lib/Bcfg2/Client/Frame.py
@@ -310,10 +310,10 @@ class Frame(object):
             for bundle in self.setup['bundle']:
                 if bundle not in all_bundle_names:
                     self.logger.info("Warning: Bundle %s not found" % bundle)
-            bundles = filter(lambda b: b.get('name') in self.setup['bundle'],
-                             bundles)
+            bundles = [b for b in bundles
+                       if b.get('name') in self.setup['bundle']]
         elif self.setup['indep']:
-            bundles = filter(lambda b: b.tag != 'Bundle', bundles)
+            bundles = [b for b in bundles if b.tag != 'Bundle']
         if self.setup['skipbundle']:
             # warn if non-existent bundle given
             if not self.setup['bundle_quick']:
@@ -321,14 +321,13 @@ class Frame(object):
                     if bundle not in all_bundle_names:
                         self.logger.info("Warning: Bundle %s not found" %
                                          bundle)
-            bundles = filter(lambda b: \
-                                 b.get('name') not in self.setup['skipbundle'],
-                             bundles)
+            bundles = [b for b in bundles
+                       if b.get('name') not in self.setup['skipbundle']]
         if self.setup['skipindep']:
-            bundles = filter(lambda b: b.tag == 'Bundle', bundles)
+            bundles = [b for b in bundles if b.tag == 'Bundle']
 
         self.whitelist = [e for e in self.whitelist
-                          if True in [e in b for b in bundles]]
+                          if any(e in b for b in bundles)]
 
         # first process prereq actions
         for bundle in bundles[:]:
diff --git a/src/lib/Bcfg2/Client/Tools/DebInit.py b/src/lib/Bcfg2/Client/Tools/DebInit.py
index ca556e98b..d916b1662 100644
--- a/src/lib/Bcfg2/Client/Tools/DebInit.py
+++ b/src/lib/Bcfg2/Client/Tools/DebInit.py
@@ -16,7 +16,7 @@ class DebInit(Bcfg2.Client.Tools.SvcTool):
     __handles__ = [('Service', 'deb')]
     __req__ = {'Service': ['name', 'status']}
     svcre = \
-        re.compile("/etc/.*/(?P<action>[SK])(?P<sequence>\d+)(?P<name>\S+)")
+        re.compile(r'/etc/.*/(?P<action>[SK])(?P<sequence>\d+)(?P<name>\S+)')
 
     # implement entry (Verify|Install) ops
     def VerifyService(self, entry, _):
diff --git a/src/lib/Bcfg2/Client/Tools/Encap.py b/src/lib/Bcfg2/Client/Tools/Encap.py
index 678e0f00c..270f0a5f2 100644
--- a/src/lib/Bcfg2/Client/Tools/Encap.py
+++ b/src/lib/Bcfg2/Client/Tools/Encap.py
@@ -13,7 +13,7 @@ class Encap(Bcfg2.Client.Tools.PkgTool):
     __req__ = {'Package': ['version', 'url']}
     pkgtype = 'encap'
     pkgtool = ("/usr/local/bin/epkg -l -f -q %s", ("%s", ["url"]))
-    splitter = re.compile('.*/(?P<name>[\w-]+)\-(?P<version>[\w\.+-]+)')
+    splitter = re.compile(r'.*/(?P<name>[\w-]+)\-(?P<version>[\w\.+-]+)')
 
     def RefreshPackages(self):
         """Try to find encap packages."""
diff --git a/src/lib/Bcfg2/Client/Tools/FreeBSDPackage.py b/src/lib/Bcfg2/Client/Tools/FreeBSDPackage.py
index 395f56f6a..31925fa3c 100644
--- a/src/lib/Bcfg2/Client/Tools/FreeBSDPackage.py
+++ b/src/lib/Bcfg2/Client/Tools/FreeBSDPackage.py
@@ -21,7 +21,7 @@ class FreeBSDPackage(Bcfg2.Client.Tools.PkgTool):
     def RefreshPackages(self):
         self.installed = {}
         packages = self.cmd.run("/usr/sbin/pkg_info -a -E").stdout.splitlines()
-        pattern = re.compile('(.*)-(\d.*)')
+        pattern = re.compile(r'(.*)-(\d.*)')
         for pkg in packages:
             if pattern.match(pkg):
                 name = pattern.match(pkg).group(1)
diff --git a/src/lib/Bcfg2/Client/Tools/Portage.py b/src/lib/Bcfg2/Client/Tools/Portage.py
index 69d52b052..17e7755a9 100644
--- a/src/lib/Bcfg2/Client/Tools/Portage.py
+++ b/src/lib/Bcfg2/Client/Tools/Portage.py
@@ -22,7 +22,7 @@ class Portage(Bcfg2.Client.Tools.PkgTool):
         Bcfg2.Client.Tools.PkgTool.__init__(self, logger, cfg, setup)
         self._initialised = True
         self.__important__ = self.__important__ + ['/etc/make.conf']
-        self._pkg_pattern = re.compile('(.*)-(\d.*)')
+        self._pkg_pattern = re.compile(r'(.*)-(\d.*)')
         self._ebuild_pattern = re.compile('(ebuild|binary)')
         self.cfg = cfg
         self.installed = {}
diff --git a/src/lib/Bcfg2/Client/Tools/SELinux.py b/src/lib/Bcfg2/Client/Tools/SELinux.py
index f277cb0c8..617b7c2ef 100644
--- a/src/lib/Bcfg2/Client/Tools/SELinux.py
+++ b/src/lib/Bcfg2/Client/Tools/SELinux.py
@@ -170,7 +170,7 @@ class SELinuxEntryHandler(object):
     key_format = ("name",)
     value_format = ()
     str_format = '%(name)s'
-    custom_re = re.compile(' (?P<name>\S+)$')
+    custom_re = re.compile(r' (?P<name>\S+)$')
     custom_format = None
 
     def __init__(self, tool, logger, setup, config):
diff --git a/src/lib/Bcfg2/Client/Tools/Upstart.py b/src/lib/Bcfg2/Client/Tools/Upstart.py
index 921ca849f..c96eab69d 100644
--- a/src/lib/Bcfg2/Client/Tools/Upstart.py
+++ b/src/lib/Bcfg2/Client/Tools/Upstart.py
@@ -46,7 +46,7 @@ class Upstart(Bcfg2.Client.Tools.SvcTool):
                               entry.get('name'))
             return False
 
-        match = re.compile("%s( \(.*\))? (start|stop)/(running|waiting)" %
+        match = re.compile(r'%s( \(.*\))? (start|stop)/(running|waiting)' %
                            entry.get('name')).match(output)
         if match is None:
             # service does not exist
diff --git a/src/lib/Bcfg2/Client/__init__.py b/src/lib/Bcfg2/Client/__init__.py
index dd5ae1e83..8c8c4fd94 100644
--- a/src/lib/Bcfg2/Client/__init__.py
+++ b/src/lib/Bcfg2/Client/__init__.py
@@ -1,11 +1,11 @@
 """This contains all Bcfg2 Client modules"""
 
-__all__ = ["Frame", "Tools", "XML", "Client"]
-
 import os
 import sys
 import select
-from Bcfg2.Compat import input  # pylint: disable=W0622
+from Bcfg2.Compat import input, walk_packages  # pylint: disable=W0622
+
+__all__ = [m[1] for m in walk_packages(path=__path__)]
 
 
 def prompt(msg):