Fix pylint errors

This also pins pylint to <= 0.28 so we don't have to keep playing
whack-a-mole with it.

Also removes unnecessary suppression of apt warnings. This is no
longer necessary in 12.04, so should be safe to remove. If you're on
Ubuntu < 12.04, upgrade for heaven's sake.

5 files changed, 27 insertions, 30 deletions

diff --git a/src/lib/Bcfg2/Client/Tools/APT.py b/src/lib/Bcfg2/Client/Tools/APT.py
index 300c9bc51..3c511681f 100644
--- a/src/lib/Bcfg2/Client/Tools/APT.py
+++ b/src/lib/Bcfg2/Client/Tools/APT.py
@@ -1,12 +1,10 @@
 """This is the Bcfg2 support for apt-get."""
 
-# suppress apt API warnings
-import warnings
-warnings.filterwarnings("ignore", "apt API not stable yet",
-                        FutureWarning)
-import apt.cache
 import os
 import sys
+
+import apt.cache
+
 import Bcfg2.Client.Tools
 
 
@@ -47,20 +45,20 @@ class APT(Bcfg2.Client.Tools.Tool):
                         for entry in struct
                         if entry.tag == 'Path' and
                         entry.get('type') == 'ignore']
-        self.__important__ = self.__important__ + \
-            ["%s/cache/debconf/config.dat" % self.var_path,
-             "%s/cache/debconf/templates.dat" % self.var_path,
-             '/etc/passwd', '/etc/group',
-             '%s/apt/apt.conf' % self.etc_path,
-             '%s/dpkg/dpkg.cfg' % self.etc_path] + \
+        self.__important__ = self.__important__ + [
+            "%s/cache/debconf/config.dat" % self.var_path,
+            "%s/cache/debconf/templates.dat" % self.var_path,
+            '/etc/passwd', '/etc/group',
+            '%s/apt/apt.conf' % self.etc_path,
+            '%s/dpkg/dpkg.cfg' % self.etc_path] + \
             [entry.get('name') for struct in config for entry in struct
-             if entry.tag == 'Path' and
-             entry.get('name').startswith(
-                 '%s/apt/sources.list' % self.etc_path)]
+             if (entry.tag == 'Path' and
+                 entry.get('name').startswith(
+                     '%s/apt/sources.list' % self.etc_path)]
         self.nonexistent = [entry.get('name') for struct in config
                             for entry in struct
-                            if entry.tag == 'Path' and
-                            entry.get('type') == 'nonexistent']
+                            if (entry.tag == 'Path' and
+                                entry.get('type') == 'nonexistent')]
         os.environ["DEBIAN_FRONTEND"] = 'noninteractive'
         self.actions = {}
         if self.setup['kevlar'] and not self.setup['dryrun']:
diff --git a/src/lib/Bcfg2/Client/Tools/MacPorts.py b/src/lib/Bcfg2/Client/Tools/MacPorts.py
index 40d90eec9..116b24687 100644
--- a/src/lib/Bcfg2/Client/Tools/MacPorts.py
+++ b/src/lib/Bcfg2/Client/Tools/MacPorts.py
@@ -42,10 +42,9 @@ class MacPorts(Bcfg2.Client.Tools.PkgTool):
             return False
 
         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'):
+            if (entry.attrib['version'] == 'any' or
+                    self.installed[entry.attrib['name']] ==
+                    entry.attrib['version']):
                 # FIXME: We should be able to check this once
                 #        http://trac.macports.org/ticket/15709 is implemented
                 return True
diff --git a/src/lib/Bcfg2/Client/Tools/POSIXUsers.py b/src/lib/Bcfg2/Client/Tools/POSIXUsers.py
index bbae7abcc..b8451d9d6 100644
--- a/src/lib/Bcfg2/Client/Tools/POSIXUsers.py
+++ b/src/lib/Bcfg2/Client/Tools/POSIXUsers.py
@@ -146,8 +146,8 @@ class POSIXUsers(Bcfg2.Client.Tools.Tool):
         """ Get a list of supplmentary groups that the user in the
         given entry is a member of """
         return [g for g in self.existing['POSIXGroup'].values()
-                if entry.get("name") in g[3]
-                and self._in_managed_range('POSIXGroup', g[2])]
+                if entry.get("name") in g[3] and
+                self._in_managed_range('POSIXGroup', g[2])]
 
     def VerifyPOSIXUser(self, entry, _):
         """ Verify a POSIXUser entry """
diff --git a/src/lib/Bcfg2/Client/Tools/YUM.py b/src/lib/Bcfg2/Client/Tools/YUM.py
index a584fec86..d1fcb0f4a 100644
--- a/src/lib/Bcfg2/Client/Tools/YUM.py
+++ b/src/lib/Bcfg2/Client/Tools/YUM.py
@@ -590,8 +590,8 @@ class YUM(Bcfg2.Client.Tools.PkgTool):
                                         "an RPM release")
                     continue
                 pkg_objs = [p for p in all_pkg_objs
-                            if (p.version == nevra['version']
-                                and p.release == nevra['release'])]
+                            if (p.version == nevra['version'] and
+                                p.release == nevra['release'])]
             else:
                 pkg_objs = self.yumbase.rpmdb.searchNevra(**short_yname(nevra))
             if len(pkg_objs) == 0:
diff --git a/src/lib/Bcfg2/Client/Tools/__init__.py b/src/lib/Bcfg2/Client/Tools/__init__.py
index 0bec71e20..b5bfdb5de 100644
--- a/src/lib/Bcfg2/Client/Tools/__init__.py
+++ b/src/lib/Bcfg2/Client/Tools/__init__.py
@@ -471,9 +471,9 @@ class PkgTool(Tool):
             # set all package states to true and flush workqueues
             pkgnames = [pkg.get('name') for pkg in packages]
             for entry in list(states.keys()):
-                if (entry.tag == 'Package'
-                    and entry.get('type') == self.pkgtype
-                    and entry.get('name') in pkgnames):
+                if (entry.tag == 'Package' and
+                        entry.get('type') == self.pkgtype and
+                        entry.get('name') in pkgnames):
                     self.logger.debug('Setting state to true for pkg %s' %
                                       entry.get('name'))
                     states[entry] = True
@@ -575,7 +575,7 @@ class SvcTool(Tool):
         return self.cmd.run(self.get_svc_command(service, 'stop'))
 
     def restart_service(self, service):
-        """ Restart a service.
+        """Restart a service.
 
         :param service: The service entry to modify
         :type service: lxml.etree._Element
@@ -608,8 +608,8 @@ class SvcTool(Tool):
             return
 
         for entry in bundle:
-            if (not self.handlesEntry(entry)
-                or not self._install_allowed(entry)):
+            if (not self.handlesEntry(entry) or
+                    not self._install_allowed(entry)):
                 continue
 
             estatus = entry.get('status')