From 10cdcf6fc460992a4208915de23ac21064d597cd Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Tue, 17 Feb 2015 09:46:42 -0600 Subject: more pylint fixes --- src/lib/Bcfg2/Client/Tools/APT.py | 16 ++++++++++------ src/lib/Bcfg2/Client/Tools/YUM.py | 4 ++-- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/lib/Bcfg2/Client/Tools/APT.py b/src/lib/Bcfg2/Client/Tools/APT.py index 739ba013f..c8044d893 100644 --- a/src/lib/Bcfg2/Client/Tools/APT.py +++ b/src/lib/Bcfg2/Client/Tools/APT.py @@ -1,12 +1,15 @@ """This is the Bcfg2 support for apt-get.""" -# suppress apt API warnings -import warnings -warnings.filterwarnings("ignore", "apt API not stable yet", - FutureWarning) import os import sys +import warnings + +# suppress apt API warnings +warnings.filterwarnings("ignore", "apt API not stable yet", FutureWarning) +# pylint: disable=E402 + import apt.cache + import Bcfg2.Options import Bcfg2.Client.Tools @@ -69,8 +72,9 @@ class APT(Bcfg2.Client.Tools.Tool): '%s/apt/sources.list' % Bcfg2.Options.setup.apt_etc_path))] self.nonexistent = [entry.get('name') for struct in config - for entry in struct if entry.tag == 'Path' - and entry.get('type') == 'nonexistent'] + for entry in struct + if entry.tag == 'Path' and + entry.get('type') == 'nonexistent'] os.environ["DEBIAN_FRONTEND"] = 'noninteractive' self.actions = {} if Bcfg2.Options.setup.kevlar and not Bcfg2.Options.setup.dry_run: diff --git a/src/lib/Bcfg2/Client/Tools/YUM.py b/src/lib/Bcfg2/Client/Tools/YUM.py index a8a80974a..ade4da5b3 100644 --- a/src/lib/Bcfg2/Client/Tools/YUM.py +++ b/src/lib/Bcfg2/Client/Tools/YUM.py @@ -626,8 +626,8 @@ class YUM(Bcfg2.Client.Tools.PkgTool): "an RPM release") continue pkg_objs = [p for p in all_pkg_objs - if (p.version == nevra['version'] - and p.release == nevra['release'])] + if (p.version == nevra['version'] and + p.release == nevra['release'])] else: pkg_objs = self.yumbase.rpmdb.searchNevra(**short_yname(nevra)) if len(pkg_objs) == 0: -- cgit v1.2.3-1-g7c22