testsuite: fixed issues found by latest version of pep8

6 files changed, 31 insertions, 35 deletions

diff --git a/src/lib/Bcfg2/Server/Admin/Init.py b/src/lib/Bcfg2/Server/Admin/Init.py
index 4b8d65597..6175d8ed0 100644
--- a/src/lib/Bcfg2/Server/Admin/Init.py
+++ b/src/lib/Bcfg2/Server/Admin/Init.py
@@ -227,8 +227,8 @@ class Init(Bcfg2.Server.Admin.Mode):
     def _prompt_password(self):
         """Ask for a password or generate one if none is provided."""
         newpassword = getpass.getpass(
-                "Input password used for communication verification "
-                "(without echoing; leave blank for a random): ").strip()
+            "Input password used for communication verification "
+            "(without echoing; leave blank for a random): ").strip()
         if len(newpassword) != 0:
             self.data['password'] = newpassword
 
diff --git a/src/lib/Bcfg2/Server/Admin/Minestruct.py b/src/lib/Bcfg2/Server/Admin/Minestruct.py
index 6d0dab106..13c0563ec 100644
--- a/src/lib/Bcfg2/Server/Admin/Minestruct.py
+++ b/src/lib/Bcfg2/Server/Admin/Minestruct.py
@@ -44,7 +44,7 @@ class Minestruct(Bcfg2.Server.Admin.StructureMode):
                     extra.add(item)
         except:
             self.log.error("Failed to find extra entry info for client %s" %
-                            client)
+                           client)
             raise SystemExit(1)
         root = lxml.etree.Element("Base")
         self.log.info("Found %d extra entries" % (len(extra)))
diff --git a/src/lib/Bcfg2/Server/Admin/Perf.py b/src/lib/Bcfg2/Server/Admin/Perf.py
index 86eb6810d..f6bc22959 100644
--- a/src/lib/Bcfg2/Server/Admin/Perf.py
+++ b/src/lib/Bcfg2/Server/Admin/Perf.py
@@ -18,8 +18,7 @@ class Perf(Bcfg2.Server.Admin.Mode):
             'password': Bcfg2.Options.SERVER_PASSWORD,
             'server': Bcfg2.Options.SERVER_LOCATION,
             'user': Bcfg2.Options.CLIENT_USER,
-            'timeout': Bcfg2.Options.CLIENT_TIMEOUT,
-            }
+            'timeout': Bcfg2.Options.CLIENT_TIMEOUT}
         setup = Bcfg2.Options.OptionParser(optinfo)
         setup.parse(sys.argv[1:])
         proxy = Bcfg2.Proxy.ComponentProxy(setup['server'],
@@ -31,8 +30,8 @@ class Perf(Bcfg2.Server.Admin.Mode):
                                            timeout=setup['timeout'])
         data = proxy.get_statistics()
         for key in sorted(data.keys()):
-            output.append((key, ) +
-                          tuple(["%.06f" % item
-                                 for item in data[key][:-1]] + \
-                                    [data[key][-1]]))
+            output.append(
+                (key, ) +
+                tuple(["%.06f" % item
+                       for item in data[key][:-1]] + [data[key][-1]]))
         self.print_table(output)
diff --git a/src/lib/Bcfg2/Server/Admin/Pull.py b/src/lib/Bcfg2/Server/Admin/Pull.py
index 130e85b67..9f1b3d138 100644
--- a/src/lib/Bcfg2/Server/Admin/Pull.py
+++ b/src/lib/Bcfg2/Server/Admin/Pull.py
@@ -65,7 +65,7 @@ class Pull(Bcfg2.Server.Admin.MetadataCore):
         for plugin in self.bcore.pull_sources:
             try:
                 (owner, group, mode, contents) = \
-                        plugin.GetCurrentEntry(client, etype, ename)
+                    plugin.GetCurrentEntry(client, etype, ename)
                 break
             except Bcfg2.Server.Plugin.PluginExecutionError:
                 if plugin == self.bcore.pull_sources[-1]:
diff --git a/src/lib/Bcfg2/Server/Admin/Xcmd.py b/src/lib/Bcfg2/Server/Admin/Xcmd.py
index 79eeebc7c..be556bed4 100644
--- a/src/lib/Bcfg2/Server/Admin/Xcmd.py
+++ b/src/lib/Bcfg2/Server/Admin/Xcmd.py
@@ -19,8 +19,7 @@ class Xcmd(Bcfg2.Server.Admin.Mode):
             'key': Bcfg2.Options.SERVER_KEY,
             'certificate': Bcfg2.Options.CLIENT_CERT,
             'ca': Bcfg2.Options.CLIENT_CA,
-            'timeout': Bcfg2.Options.CLIENT_TIMEOUT,
-            }
+            'timeout': Bcfg2.Options.CLIENT_TIMEOUT}
         setup = Bcfg2.Options.OptionParser(optinfo)
         setup.parse(args)
         Bcfg2.Proxy.RetryMethod.max_retries = 1
@@ -54,5 +53,5 @@ class Xcmd(Bcfg2.Server.Admin.Mode):
             print("Proxy Error: %s" % err)
             return
 
-        if data != None:
+        if data is not None:
             print(data)
diff --git a/src/lib/Bcfg2/Server/Admin/__init__.py b/src/lib/Bcfg2/Server/Admin/__init__.py
index 19175533f..a3c45b8c3 100644
--- a/src/lib/Bcfg2/Server/Admin/__init__.py
+++ b/src/lib/Bcfg2/Server/Admin/__init__.py
@@ -1,23 +1,21 @@
 """ Base classes for admin modes """
 
-__all__ = [
-        'Backup',
-        'Bundle',
-        'Client',
-        'Compare',
-        'Group',
-        'Init',
-        'Minestruct',
-        'Perf',
-        'Pull',
-        'Query',
-        'Reports',
-        'Snapshots',
-        'Syncdb',
-        'Tidy',
-        'Viz',
-        'Xcmd'
-        ]
+__all__ = ['Backup',
+           'Bundle',
+           'Client',
+           'Compare',
+           'Group',
+           'Init',
+           'Minestruct',
+           'Perf',
+           'Pull',
+           'Query',
+           'Reports',
+           'Snapshots',
+           'Syncdb',
+           'Tidy',
+           'Viz',
+           'Xcmd']
 
 import re
 import sys
@@ -105,15 +103,15 @@ class Mode(object):
         # Calculate column widths (longest item in each column
         # plus padding on both sides)
         cols = list(zip(*rows))
-        col_widths = [max([len(str(item)) + 2 * padding for \
-                          item in col]) for col in cols]
+        col_widths = [max([len(str(item)) + 2 * padding
+                           for item in col]) for col in cols]
         borderline = vdelim.join([w * hdelim for w in col_widths])
 
         # Print out the table
         print(borderline)
         for row in rows:
-            print(vdelim.join([justify(str(item), width) for \
-                               (item, width) in zip(row, col_widths)]))
+            print(vdelim.join([justify(str(item), width)
+                               for (item, width) in zip(row, col_widths)]))
             if hdr:
                 print(borderline)
                 hdr = False