diff options
author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2015-02-24 16:29:07 -0600 |
---|---|---|
committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2015-02-25 07:59:49 -0600 |
commit | cae39b746051ff5f3257342d0659340283b2d6ef (patch) | |
tree | 15754ec473e088b52cc8afc4d9ecaf8ee8d7ca2d /src/lib/Bcfg2/Server/Lint/ValidateJSON.py | |
parent | 78cac1d0a6923ebc73ff221f8501885c36c112c1 (diff) | |
download | bcfg2-cae39b746051ff5f3257342d0659340283b2d6ef.tar.gz bcfg2-cae39b746051ff5f3257342d0659340283b2d6ef.tar.bz2 bcfg2-cae39b746051ff5f3257342d0659340283b2d6ef.zip |
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.
Diffstat (limited to 'src/lib/Bcfg2/Server/Lint/ValidateJSON.py')
-rw-r--r-- | src/lib/Bcfg2/Server/Lint/ValidateJSON.py | 21 |
1 files changed, 8 insertions, 13 deletions
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 |