testsuite: fixed issues found by latest version of pep8

4 files changed, 18 insertions, 18 deletions

diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/Apt.py b/src/lib/Bcfg2/Server/Plugins/Packages/Apt.py
index 27f493677..5ae160994 100644
--- a/src/lib/Bcfg2/Server/Plugins/Packages/Apt.py
+++ b/src/lib/Bcfg2/Server/Plugins/Packages/Apt.py
@@ -30,8 +30,8 @@ class AptCollection(Collection):
         """ Get an APT configuration file (i.e., ``sources.list``).
 
         :returns: string """
-        lines = ["# This config was generated automatically by the Bcfg2 " \
-                     "Packages plugin", '']
+        lines = ["# This config was generated automatically by the Bcfg2 "
+                 "Packages plugin", '']
 
         for source in self:
             if source.rawurl:
diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/Source.py b/src/lib/Bcfg2/Server/Plugins/Packages/Source.py
index 985405e65..0c6ee0759 100644
--- a/src/lib/Bcfg2/Server/Plugins/Packages/Source.py
+++ b/src/lib/Bcfg2/Server/Plugins/Packages/Source.py
@@ -52,8 +52,8 @@ import re
 import sys
 import Bcfg2.Server.Plugin
 from Bcfg2.Compat import HTTPError, HTTPBasicAuthHandler, \
-     HTTPPasswordMgrWithDefaultRealm, install_opener, build_opener, \
-     urlopen, cPickle, md5
+    HTTPPasswordMgrWithDefaultRealm, install_opener, build_opener, urlopen, \
+    cPickle, md5
 
 
 def fetch_url(url):
diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py b/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py
index 6b8ed1f7d..77186d2cb 100644
--- a/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py
+++ b/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py
@@ -66,7 +66,7 @@ from Bcfg2.Compat import StringIO, cPickle, HTTPError, URLError, \
 # pylint: enable=W0622
 from Bcfg2.Server.Plugins.Packages.Collection import Collection
 from Bcfg2.Server.Plugins.Packages.Source import SourceInitError, Source, \
-     fetch_url
+    fetch_url
 
 LOGGER = logging.getLogger(__name__)
 
@@ -281,7 +281,7 @@ class YumCollection(Collection):
             #: Define a unique cache file for this collection to use
             #: for cached yum metadata
             self.cachefile = os.path.join(self.cachepath,
-                                         "cache-%s" % self.cachekey)
+                                          "cache-%s" % self.cachekey)
             if not os.path.exists(self.cachefile):
                 os.mkdir(self.cachefile)
 
@@ -1169,7 +1169,7 @@ class YumSource(Source):
                     if entry.get('name').startswith('/'):
                         self.needed_paths.add(entry.get('name'))
             pro = pdata.find(RP + 'provides')
-            if pro != None:
+            if pro is not None:
                 for entry in pro.getchildren():
                     prov = entry.get('name')
                     if prov not in self.provides[arch]:
@@ -1185,9 +1185,9 @@ class YumSource(Source):
             try:
                 groupid = group.xpath('id')[0].text
                 self.yumgroups[groupid] = {'mandatory': list(),
-                                        'default': list(),
-                                        'optional': list(),
-                                        'conditional': list()}
+                                           'default': list(),
+                                           'optional': list(),
+                                           'conditional': list()}
             except IndexError:
                 continue
             try:
diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py b/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py
index 0b6889b09..4f163a1ab 100644
--- a/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py
+++ b/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py
@@ -247,14 +247,14 @@ class Packages(Bcfg2.Server.Plugin.Plugin,
                 return True
         elif entry.tag == 'Path':
             # managed entries for yum/apt configs
-            if (entry.get("name") == \
-                    self.core.setup.cfp.get("packages",
-                                            "yum_config",
-                                            default=YUM_CONFIG_DEFAULT) or
-                entry.get("name") == \
-                    self.core.setup.cfp.get("packages",
-                                            "apt_config",
-                                            default=APT_CONFIG_DEFAULT)):
+            if (entry.get("name") ==
+                self.core.setup.cfp.get("packages",
+                                        "yum_config",
+                                        default=YUM_CONFIG_DEFAULT) or
+                entry.get("name") ==
+                self.core.setup.cfp.get("packages",
+                                        "apt_config",
+                                        default=APT_CONFIG_DEFAULT)):
                 return True
         return False