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.

7 files changed, 52 insertions, 51 deletions

diff --git a/src/lib/Bcfg2/Server/FileMonitor/__init__.py b/src/lib/Bcfg2/Server/FileMonitor/__init__.py
index 7a5d901fd..083e50fe6 100644
--- a/src/lib/Bcfg2/Server/FileMonitor/__init__.py
+++ b/src/lib/Bcfg2/Server/FileMonitor/__init__.py
@@ -336,8 +336,11 @@ class FileMonitor(Debuggable):
 available = dict()  # pylint: disable=C0103
 
 # TODO: loading the monitor drivers should be automatic
-from Bcfg2.Server.FileMonitor.Pseudo import Pseudo
-available['pseudo'] = Pseudo
+try:
+    from Bcfg2.Server.FileMonitor.Pseudo import Pseudo
+    available['pseudo'] = Pseudo
+except ImportError:
+    pass
 
 try:
     from Bcfg2.Server.FileMonitor.Fam import Fam
diff --git a/src/lib/Bcfg2/Server/Lint/Validate.py b/src/lib/Bcfg2/Server/Lint/Validate.py
index 3efcc890d..1e33ec398 100644
--- a/src/lib/Bcfg2/Server/Lint/Validate.py
+++ b/src/lib/Bcfg2/Server/Lint/Validate.py
@@ -1,12 +1,16 @@
-""" Ensure that all XML files in the Bcfg2 repository validate
-according to their respective schemas. """
+"""Validate XML files.
 
+Ensure that all XML files in the Bcfg2 repository validate according
+to their respective schemas.
+"""
+
+import glob
 import os
 import sys
-import glob
-import fnmatch
+
 import lxml.etree
 from subprocess import Popen, PIPE, STDOUT
+
 import Bcfg2.Server.Lint
 
 
@@ -204,17 +208,10 @@ class Validate(Bcfg2.Server.Lint.ServerlessPlugin):
         values are lists of the full paths to all files in the Bcfg2
         repository (or given with ``bcfg2-lint --stdin``) that match
         the glob."""
-        if self.files is not None:
-            listfiles = lambda p: fnmatch.filter(self.files,
-                                                 os.path.join('*', p))
-        else:
-            listfiles = lambda p: glob.glob(os.path.join(self.config['repo'],
-                                                         p))
-
         for path in self.filesets.keys():
             if '/**/' in path:
                 if self.files is not None:
-                    self.filelists[path] = listfiles(path)
+                    self.filelists[path] = self.list_matching_files(path)
                 else:  # self.files is None
                     fpath, fname = path.split('/**/')
                     self.filelists[path] = []
@@ -225,9 +222,9 @@ class Validate(Bcfg2.Server.Lint.ServerlessPlugin):
                                                      for f in files
                                                      if f == fname])
             else:
-                self.filelists[path] = listfiles(path)
+                self.filelists[path] = self.list_matching_files(path)
 
-        self.filelists['props'] = listfiles("Properties/*.xml")
+        self.filelists['props'] = self.list_matching_files("Properties/*.xml")
 
     def _load_schema(self, filename):
         """ Load an XML schema document, returning the Schema object
diff --git a/src/lib/Bcfg2/Server/Lint/ValidateJSON.py b/src/lib/Bcfg2/Server/Lint/ValidateJSON.py
index 1f55962eb..bdbe6a271 100644
--- a/src/lib/Bcfg2/Server/Lint/ValidateJSON.py
+++ b/src/lib/Bcfg2/Server/Lint/ValidateJSON.py
@@ -1,11 +1,13 @@
-"""Ensure that all JSON files in the Bcfg2 repository are
+"""Validate JSON files.
+
+Ensure that all JSON files in the Bcfg2 repository are
 valid. Currently, the only plugins that uses JSON are Ohai and
-Properties."""
+Properties.
+"""
 
 import os
 import sys
-import glob
-import fnmatch
+
 import Bcfg2.Server.Lint
 
 try:
@@ -48,18 +50,11 @@ class ValidateJSON(Bcfg2.Server.Lint.ServerlessPlugin):
     def get_files(self):
         """Return a list of all JSON files to validate, based on
         :attr:`Bcfg2.Server.Lint.ValidateJSON.ValidateJSON.globs`. """
-        if self.files is not None:
-            listfiles = lambda p: fnmatch.filter(self.files,
-                                                 os.path.join('*', p))
-        else:
-            listfiles = lambda p: glob.glob(os.path.join(self.config['repo'],
-                                                         p))
-
         rv = []
         for path in self.globs:
             if '/**/' in path:
                 if self.files is not None:
-                    rv.extend(listfiles(path))
+                    rv.extend(self.list_matching_files(path))
                 else:  # self.files is None
                     fpath, fname = path.split('/**/')
                     for root, _, files in \
@@ -68,5 +63,5 @@ class ValidateJSON(Bcfg2.Server.Lint.ServerlessPlugin):
                         rv.extend([os.path.join(root, f)
                                    for f in files if f == fname])
             else:
-                rv.extend(listfiles(path))
+                rv.extend(self.list_matching_files(path))
         return rv
diff --git a/src/lib/Bcfg2/Server/Lint/__init__.py b/src/lib/Bcfg2/Server/Lint/__init__.py
index 28644263f..ae2b81a61 100644
--- a/src/lib/Bcfg2/Server/Lint/__init__.py
+++ b/src/lib/Bcfg2/Server/Lint/__init__.py
@@ -1,14 +1,19 @@
 """ Base classes for Lint plugins and error handling """
 
 import os
+import fnmatch
+import glob
 import sys
 import logging
 from copy import copy
 import textwrap
+import time
+
 import lxml.etree
 import fcntl
 import termios
 import struct
+
 from Bcfg2.Compat import walk_packages
 
 plugins = [m[1] for m in walk_packages(path=__path__)]  # pylint: disable=C0103
@@ -139,6 +144,13 @@ class Plugin(object):
                 xml_declaration=False).decode("UTF-8").strip()
         return "   line %s: %s" % (element.sourceline, xml)
 
+    def list_matching_files(self, path):
+        """list all files matching the path in self.files or the bcfg2 repo."""
+        if self.files is not None:
+            return fnmatch.filter(self.files, os.path.join('*', path))
+        else:
+            return glob.glob(os.path.join(self.config['repo'], path))
+
 
 class ErrorHandler(object):
     """ A class to handle errors for bcfg2-lint plugins """
diff --git a/src/lib/Bcfg2/Server/Plugin/__init__.py b/src/lib/Bcfg2/Server/Plugin/__init__.py
index ed1282ba0..05bb92223 100644
--- a/src/lib/Bcfg2/Server/Plugin/__init__.py
+++ b/src/lib/Bcfg2/Server/Plugin/__init__.py
@@ -11,11 +11,6 @@ documentation it's not necessary to use the submodules.  E.g., you can
 
     from Bcfg2.Server.Plugin.base import Plugin
 """
-
-import os
-import sys
-sys.path.append(os.path.dirname(__file__))
-
 # pylint: disable=W0401
 from Bcfg2.Server.Plugin.base import *
 from Bcfg2.Server.Plugin.interfaces import *
diff --git a/src/lib/Bcfg2/Server/Plugins/GroupPatterns.py b/src/lib/Bcfg2/Server/Plugins/GroupPatterns.py
index 09685d972..eadd918b7 100644
--- a/src/lib/Bcfg2/Server/Plugins/GroupPatterns.py
+++ b/src/lib/Bcfg2/Server/Plugins/GroupPatterns.py
@@ -149,15 +149,13 @@ class GroupPatternsLint(Bcfg2.Server.Lint.ServerPlugin):
 
     def check(self, entry, groups, ptype="NamePattern"):
         """ Check a single pattern for validity """
-        if ptype == "NamePattern":
-            pmap = lambda p: PatternMap(p, None, groups)
-        else:
-            pmap = lambda p: PatternMap(None, p, groups)
-
         for el in entry.findall(ptype):
             pat = el.text
             try:
-                pmap(pat)
+                if ptype == "NamePattern":
+                    PatternMap(pat, None, groups)
+                else:
+                    PatternMap(None, pat, groups)
             except:  # pylint: disable=W0702
                 err = sys.exc_info()[1]
                 self.LintError("pattern-fails-to-initialize",
diff --git a/src/lib/Bcfg2/Server/Plugins/SSLCA.py b/src/lib/Bcfg2/Server/Plugins/SSLCA.py
index f111ffc60..a33b2f448 100644
--- a/src/lib/Bcfg2/Server/Plugins/SSLCA.py
+++ b/src/lib/Bcfg2/Server/Plugins/SSLCA.py
@@ -150,15 +150,13 @@ class SSLCAEntrySet(Bcfg2.Server.Plugin.EntrySet):
             if passphrase:
                 cmd.extend(["-passin", "pass:%s" % passphrase])
 
-                def _scrub_pass(arg):
-                    """ helper to scrub the passphrase from the
-                    argument list """
-                    if arg.startswith("pass:"):
-                        return "pass:******"
-                    else:
-                        return arg
-            else:
-                _scrub_pass = lambda a: a
+            def _scrub_pass(arg):
+                """ helper to scrub the passphrase from the
+                argument list for debugging. """
+                if arg.startswith("pass:"):
+                    return "pass:******"
+                else:
+                    return arg
 
             self.debug_log("SSLCA: Generating new certificate: %s" %
                            " ".join(_scrub_pass(a) for a in cmd))
@@ -362,10 +360,13 @@ class SSLCA(Bcfg2.Server.Plugin.GroupSpool):
     """ The SSLCA generator handles the creation and management of ssl
     certificates and their keys. """
     __author__ = 'g.hagger@gmail.com'
-    # python 2.5 doesn't support mixing *magic and keyword arguments
-    es_cls = lambda self, *args: SSLCAEntrySet(*args, **dict(parent=self))
     es_child_cls = SSLCADataFile
 
+    def es_cls(self, *args):
+        """Fake entry set 'class' that sets this as the parent."""
+        # python 2.5 doesn't support mixing *magic and keyword arguments
+        return SSLCAEntrySet(*args, **dict(parent=self))
+
     def get_ca(self, name):
         """ get a dict describing a CA from the config file """
         return dict(self.core.setup.cfp.items("sslca_%s" % name))