summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/Server/Lint/GroupPatterns.py
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2015-02-17 08:55:23 -0600
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2015-02-17 09:05:10 -0600
commit6491d368d40f3de7d6c49b69b782497151d050a5 (patch)
treefff48c07ef6ff75b4e27e717cf12e3574f60db35 /src/lib/Bcfg2/Server/Lint/GroupPatterns.py
parentf4d30301fd4b7dca4375875aedae59e5c3542a34 (diff)
downloadbcfg2-6491d368d40f3de7d6c49b69b782497151d050a5.tar.gz
bcfg2-6491d368d40f3de7d6c49b69b782497151d050a5.tar.bz2
bcfg2-6491d368d40f3de7d6c49b69b782497151d050a5.zip
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.
Diffstat (limited to 'src/lib/Bcfg2/Server/Lint/GroupPatterns.py')
-rw-r--r--src/lib/Bcfg2/Server/Lint/GroupPatterns.py11
1 files changed, 5 insertions, 6 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",