From ba4f63898809aebbfcdeb1546ccd2b53c7f3f7c2 Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Fri, 6 Sep 2013 10:38:55 -0500 Subject: Pylint/PEP8 fixes Signed-off-by: Sol Jerome --- src/lib/Bcfg2/Server/Lint/Genshi.py | 6 +++--- src/lib/Bcfg2/Server/Lint/MergeFiles.py | 4 ++-- src/lib/Bcfg2/Server/Lint/Metadata.py | 2 +- src/lib/Bcfg2/Server/Lint/Pkgmgr.py | 2 +- src/lib/Bcfg2/Server/Lint/RequiredAttrs.py | 8 ++++---- src/lib/Bcfg2/Server/Lint/Validate.py | 3 ++- src/lib/Bcfg2/Server/Lint/__init__.py | 4 ++-- 7 files changed, 15 insertions(+), 14 deletions(-) (limited to 'src/lib/Bcfg2/Server/Lint') diff --git a/src/lib/Bcfg2/Server/Lint/Genshi.py b/src/lib/Bcfg2/Server/Lint/Genshi.py index e3a0004a6..a2581e70b 100755 --- a/src/lib/Bcfg2/Server/Lint/Genshi.py +++ b/src/lib/Bcfg2/Server/Lint/Genshi.py @@ -39,8 +39,8 @@ class Genshi(Bcfg2.Server.Lint.ServerPlugin): for entryset in self.core.plugins['Cfg'].entries.values(): for entry in entryset.entries.values(): if (self.HandlesFile(entry.name) and - isinstance(entry, CfgGenshiGenerator) and - not entry.template): + isinstance(entry, CfgGenshiGenerator) and + not entry.template): self.check_template(entry.loader, entry.name, cls=NewTextTemplate) @@ -49,5 +49,5 @@ class Genshi(Bcfg2.Server.Lint.ServerPlugin): loader = TemplateLoader() for entry in self.core.plugins['Bundler'].entries.values(): if (self.HandlesFile(entry.name) and - entry.template is not None): + entry.template is not None): self.check_template(loader, entry.name, cls=MarkupTemplate) diff --git a/src/lib/Bcfg2/Server/Lint/MergeFiles.py b/src/lib/Bcfg2/Server/Lint/MergeFiles.py index 972475d91..cb14ca477 100644 --- a/src/lib/Bcfg2/Server/Lint/MergeFiles.py +++ b/src/lib/Bcfg2/Server/Lint/MergeFiles.py @@ -87,8 +87,8 @@ class MergeFiles(Bcfg2.Server.Lint.ServerPlugin): seqmatch = SequenceMatcher(None, fdata.data, cdata.data) # perform progressively more expensive comparisons if (seqmatch.real_quick_ratio() > Bcfg2.Options.setup.threshold and - seqmatch.quick_ratio() > Bcfg2.Options.setup.threshold and - seqmatch.ratio() > Bcfg2.Options.setup.threshold): + seqmatch.quick_ratio() > Bcfg2.Options.setup.threshold and + seqmatch.ratio() > Bcfg2.Options.setup.threshold): rv.extend( self._find_similar((cname, cdata), copy.copy(others))) return rv diff --git a/src/lib/Bcfg2/Server/Lint/Metadata.py b/src/lib/Bcfg2/Server/Lint/Metadata.py index 3c8f2831d..bf19c25fc 100644 --- a/src/lib/Bcfg2/Server/Lint/Metadata.py +++ b/src/lib/Bcfg2/Server/Lint/Metadata.py @@ -142,7 +142,7 @@ class Metadata(ServerPlugin): def default_is_profile(self): """ Ensure that the default group is a profile group. """ if (self.metadata.default and - not self.metadata.groups[self.metadata.default].is_profile): + not self.metadata.groups[self.metadata.default].is_profile): xdata = \ self.metadata.groups_xml.xdata.xpath("//Group[@name='%s']" % self.metadata.default)[0] diff --git a/src/lib/Bcfg2/Server/Lint/Pkgmgr.py b/src/lib/Bcfg2/Server/Lint/Pkgmgr.py index 6b718d8b5..3f0b9477c 100644 --- a/src/lib/Bcfg2/Server/Lint/Pkgmgr.py +++ b/src/lib/Bcfg2/Server/Lint/Pkgmgr.py @@ -26,7 +26,7 @@ class Pkgmgr(ServerlessPlugin): if pkg.getparent().tag == 'Group': grp = pkg.getparent().get('name') if (type(grp) is not str and - grp.getparent().tag == 'Group'): + grp.getparent().tag == 'Group'): pgrp = grp.getparent().get('name') else: pgrp = 'none' diff --git a/src/lib/Bcfg2/Server/Lint/RequiredAttrs.py b/src/lib/Bcfg2/Server/Lint/RequiredAttrs.py index cf7b51ecc..5d9e229fa 100644 --- a/src/lib/Bcfg2/Server/Lint/RequiredAttrs.py +++ b/src/lib/Bcfg2/Server/Lint/RequiredAttrs.py @@ -138,7 +138,7 @@ class RequiredAttrs(Bcfg2.Server.Lint.ServerPlugin): for source in self.core.plugins['Packages'].sources: if isinstance(source, Yum.YumSource): if (not source.pulp_id and not source.url and - not source.rawurl): + not source.rawurl): self.LintError( "required-attrs-missing", "A %s source must have either a url, rawurl, or " @@ -152,7 +152,7 @@ class RequiredAttrs(Bcfg2.Server.Lint.ServerPlugin): (source.ptype, self.RenderXML(source.xsource))) if (not isinstance(source, Apt.AptSource) and - source.recommended): + source.recommended): self.LintError( "extra-attrs", "The recommended attribute is not supported on %s sources:" @@ -180,7 +180,7 @@ class RequiredAttrs(Bcfg2.Server.Lint.ServerPlugin): for bundle in self.core.plugins['Bundler'].entries.values(): if self.HandlesFile(bundle.name) and bundle.template is None: for path in bundle.xdata.xpath( - "//*[substring(name(), 1, 5) = 'Bound']"): + "//*[substring(name(), 1, 5) = 'Bound']"): self.check_entry(path, bundle.name) def check_entry(self, entry, filename): @@ -228,7 +228,7 @@ class RequiredAttrs(Bcfg2.Server.Lint.ServerPlugin): fmt = required_attrs['__text__'] del required_attrs['__text__'] if (not entry.text and - not entry.get('empty', 'false').lower() == 'true'): + not entry.get('empty', 'false').lower() == 'true'): self.LintError("required-attrs-missing", "Text missing for %s %s in %s: %s" % (tag, name, filename, diff --git a/src/lib/Bcfg2/Server/Lint/Validate.py b/src/lib/Bcfg2/Server/Lint/Validate.py index de7ae038a..2042382e7 100644 --- a/src/lib/Bcfg2/Server/Lint/Validate.py +++ b/src/lib/Bcfg2/Server/Lint/Validate.py @@ -182,7 +182,8 @@ class Validate(Bcfg2.Server.Lint.ServerlessPlugin): fpath, fname = path.split('/**/') self.filelists[path] = [] for root, _, files in os.walk( - os.path.join(Bcfg2.Options.setup.repository, fpath)): + os.path.join(Bcfg2.Options.setup.repository, + fpath)): self.filelists[path].extend([os.path.join(root, f) for f in files if f == fname]) diff --git a/src/lib/Bcfg2/Server/Lint/__init__.py b/src/lib/Bcfg2/Server/Lint/__init__.py index c8cdb5be1..f918ad851 100644 --- a/src/lib/Bcfg2/Server/Lint/__init__.py +++ b/src/lib/Bcfg2/Server/Lint/__init__.py @@ -400,8 +400,8 @@ class CLI(object): self.run_server_plugins() if (self.errorhandler.errors or - self.errorhandler.warnings or - Bcfg2.Options.setup.verbose): + self.errorhandler.warnings or + Bcfg2.Options.setup.verbose): print("%d errors" % self.errorhandler.errors) print("%d warnings" % self.errorhandler.warnings) -- cgit v1.2.3-1-g7c22