Pylint fixes for pylint 0.28

This also pins Pylint to 0.28 or older so that we don't have to do
this again. At some point we should look at upgrading to Pylint 1.x.

4 files changed, 40 insertions, 37 deletions

diff --git a/src/lib/Bcfg2/Server/Lint/GroupPatterns.py b/src/lib/Bcfg2/Server/Lint/GroupPatterns.py
index 8ddb9e796..deb91020d 100644
--- a/src/lib/Bcfg2/Server/Lint/GroupPatterns.py
+++ b/src/lib/Bcfg2/Server/Lint/GroupPatterns.py
@@ -2,6 +2,7 @@
 <server-plugins-grouping-grouppatterns>` """
 
 import sys
+
 from Bcfg2.Server.Lint import ServerPlugin
 from Bcfg2.Server.Plugins.GroupPatterns import PatternMap
 
@@ -28,15 +29,13 @@ class GroupPatterns(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/Lint/Validate.py b/src/lib/Bcfg2/Server/Lint/Validate.py
index cab5d248d..d6f18afbb 100644
--- a/src/lib/Bcfg2/Server/Lint/Validate.py
+++ b/src/lib/Bcfg2/Server/Lint/Validate.py
@@ -1,11 +1,15 @@
-""" 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
+
 import Bcfg2.Options
 import Bcfg2.Server.Lint
 from Bcfg2.Utils import Executor
@@ -206,17 +210,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(Bcfg2.Options.setup.repository, 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] = []
@@ -227,9 +224,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 6383a3c99..f7cf5d549 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(Bcfg2.Options.setup.repository, 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 os.walk(
@@ -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 526bdf159..903ee6326 100644
--- a/src/lib/Bcfg2/Server/Lint/__init__.py
+++ b/src/lib/Bcfg2/Server/Lint/__init__.py
@@ -1,15 +1,19 @@
 """ Base classes for Lint plugins and error handling """
 
-import os
-import sys
-import time
 import copy
 import fcntl
+import fnmatch
+import glob
+import logging
+import os
 import struct
+import sys
 import termios
-import logging
 import textwrap
+import time
+
 import lxml.etree
+
 import Bcfg2.Options
 import Bcfg2.Server.Core
 import Bcfg2.Server.Plugins
@@ -145,6 +149,14 @@ 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(Bcfg2.Options.setup.repository,
+                                          path))
+
 
 class ErrorHandler(object):
     """ A class to handle errors for bcfg2-lint plugins """