11 files changed, 26 insertions, 14 deletions
diff --git a/src/lib/Bcfg2/Compat.py b/src/lib/Bcfg2/Compat.py
index b0f0ef5cf..4bcc76e8f 100644
--- a/src/lib/Bcfg2/Compat.py
+++ b/src/lib/Bcfg2/Compat.py
@@ -51,7 +51,8 @@ except ImportError:
 
 # xmlrpc imports
 try:
-    import xmlrpclib, SimpleXMLRPCServer
+    import xmlrpclib
+    import SimpleXMLRPCServer
 except ImportError:
     import xmlrpc.client as xmlrpclib
     import xmlrpc.server as SimpleXMLRPCServer
@@ -73,6 +74,7 @@ try:
 except NameError:
     unicode = str
 
+
 def u_str(string, encoding=None):
     """ print to file compatibility """
     if sys.hexversion >= 0x03000000:
diff --git a/src/lib/Bcfg2/Proxy.py b/src/lib/Bcfg2/Proxy.py
index 3b406c78e..3aefed5d1 100644
--- a/src/lib/Bcfg2/Proxy.py
+++ b/src/lib/Bcfg2/Proxy.py
@@ -51,13 +51,16 @@ class ProxyError(Exception):
             msg = str(err)
         Exception.__init__(self, msg)
 
+
 class CertificateError(Exception):
     def __init__(self, commonName):
         self.commonName = commonName
+
     def __str__(self):
         return ("Got unallowed commonName %s from server"
                 % self.commonName)
 
+
 _orig_Method = xmlrpclib._Method
 
 class RetryMethod(xmlrpclib._Method):
diff --git a/src/lib/Bcfg2/Server/Plugin/interfaces.py b/src/lib/Bcfg2/Server/Plugin/interfaces.py
index f42ada773..cb996b1ca 100644
--- a/src/lib/Bcfg2/Server/Plugin/interfaces.py
+++ b/src/lib/Bcfg2/Server/Plugin/interfaces.py
@@ -313,6 +313,7 @@ class Threaded(object):
         """
         raise NotImplementedError
 
+
 class ThreadedStatistics(Statistics, Threaded, threading.Thread):
     """ ThreadedStatistics plugins process client statistics in a
     separate thread. """
diff --git a/src/lib/Bcfg2/Server/Plugins/DBStats.py b/src/lib/Bcfg2/Server/Plugins/DBStats.py
index e0794f019..e6ef50fa1 100644
--- a/src/lib/Bcfg2/Server/Plugins/DBStats.py
+++ b/src/lib/Bcfg2/Server/Plugins/DBStats.py
@@ -9,7 +9,6 @@ class DBStats(Bcfg2.Server.Plugin.Plugin):
     def __init__(self, core, datastore):
         Bcfg2.Server.Plugin.Plugin.__init__(self, core, datastore)
         self.logger.error("DBStats has been replaced with Reporting")
-        self.logger.error("DBStats: Be sure to migrate your data "\
-            "before running the report collector")
+        self.logger.error("DBStats: Be sure to migrate your data "
+                          "before running the report collector")
         raise Bcfg2.Server.Plugin.PluginInitError
-
diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/Apt.py b/src/lib/Bcfg2/Server/Plugins/Packages/Apt.py
index ec0d8e828..27f493677 100644
--- a/src/lib/Bcfg2/Server/Plugins/Packages/Apt.py
+++ b/src/lib/Bcfg2/Server/Plugins/Packages/Apt.py
@@ -35,7 +35,7 @@ class AptCollection(Collection):
 
         for source in self:
             if source.rawurl:
-                self.logger.info("Packages: Skipping rawurl %s" % 
+                self.logger.info("Packages: Skipping rawurl %s" %
                                  source.rawurl)
             else:
                 lines.append("deb %s %s %s" % (source.url, source.version,
diff --git a/src/sbin/bcfg2-admin b/src/sbin/bcfg2-admin
index fa4307702..31e49c00b 100755
--- a/src/sbin/bcfg2-admin
+++ b/src/sbin/bcfg2-admin
@@ -10,6 +10,7 @@ import Bcfg2.Options
 import Bcfg2.Server.Admin
 from Bcfg2.Compat import StringIO
 
+
 def mode_import(modename):
     """Load Bcfg2.Server.Admin.<mode>."""
     modname = modename.capitalize()
diff --git a/src/sbin/bcfg2-crypt b/src/sbin/bcfg2-crypt
index fde6af582..eae316da5 100755
--- a/src/sbin/bcfg2-crypt
+++ b/src/sbin/bcfg2-crypt
@@ -261,7 +261,7 @@ class Encryptor(object):
                                     (self.pname, pname))
         return (passphrase, pname)
 
-    def _get_passphrase(self, chunk): #  pylint: disable=W0613
+    def _get_passphrase(self, chunk):  # pylint: disable=W0613
         """ get the passphrase for a chunk of a file """
         return None
 
diff --git a/src/sbin/bcfg2-info b/src/sbin/bcfg2-info
index fa8c89b46..311784606 100755
--- a/src/sbin/bcfg2-info
+++ b/src/sbin/bcfg2-info
@@ -474,7 +474,7 @@ Bcfg2 client itself.""")
                 ('Password', self.setup['password']),
                 ('Server Metadata Connector', self.setup['mconnect']),
                 ('Filemonitor', self.setup['filemonitor']),
-                ('Server address',    self.setup['location']),
+                ('Server address', self.setup['location']),
                 ('Path to key', self.setup['key']),
                 ('Path to SSL certificate', self.setup['cert']),
                 ('Path to SSL CA certificate', self.setup['ca']),
@@ -727,7 +727,6 @@ Bcfg2 client itself.""")
         pass
 
 
-
 def build_usage():
     """ build usage message """
     cmd_blacklist = ["do_loop", "do_EOF"]
diff --git a/src/sbin/bcfg2-server b/src/sbin/bcfg2-server
index 8322edeaa..cdca71e74 100755
--- a/src/sbin/bcfg2-server
+++ b/src/sbin/bcfg2-server
@@ -11,6 +11,7 @@ from Bcfg2.Server.Core import CoreInitError
 
 LOGGER = logging.getLogger('bcfg2-server')
 
+
 def main():
     optinfo = dict()
     optinfo.update(Bcfg2.Options.CLI_COMMON_OPTIONS)
@@ -22,7 +23,7 @@ def main():
     if not os.path.exists(setup['configfile']):
         print("Could not read %s" % setup['configfile'])
         sys.exit(1)
-    
+
     if setup['backend'] not in ['best', 'cherrypy', 'builtin']:
         print("Unknown server backend %s, using 'best'" % setup['backend'])
         setup['backend'] = 'best'
diff --git a/src/sbin/bcfg2-test b/src/sbin/bcfg2-test
index 3dcad8689..4a57fa42f 100755
--- a/src/sbin/bcfg2-test
+++ b/src/sbin/bcfg2-test
@@ -5,7 +5,6 @@ without failures"""
 
 import os
 import sys
-import signal
 import fnmatch
 import logging
 import Bcfg2.Logger
@@ -26,7 +25,7 @@ except ImportError:
 class CapturingLogger(object):
     """ Fake logger that captures logging output so that errors are
     only displayed for clients that fail tests """
-    def __init__(self, *args, **kwargs):
+    def __init__(self, *args, **kwargs):  # pylint: disable=W0613
         self.output = []
 
     def error(self, msg):
@@ -46,6 +45,7 @@ class CapturingLogger(object):
         self.output.append(msg)
 
     def reset_output(self):
+        """ Reset the captured output """
         self.output = []
 
 
@@ -182,7 +182,8 @@ def run_child(setup, clients, queue):
     core.shutdown()
 
 
-def main():
+def parse_args():
+    """ Parse command line arguments. """
     optinfo = dict(Bcfg2.Options.TEST_COMMON_OPTIONS)
     optinfo.update(Bcfg2.Options.CLI_COMMON_OPTIONS)
     optinfo.update(Bcfg2.Options.SERVER_COMMON_OPTIONS)
@@ -230,7 +231,12 @@ def main():
                 pass
         if xunitfile and not setup['xunit']:
             setup['xunit'] = xunitfile
+    return setup
+
 
+def main():
+    setup = parse_args()
+    logger = logging.getLogger(sys.argv[0])
     core = get_core(setup)
 
     if setup['args']:
diff --git a/src/sbin/bcfg2-yum-helper b/src/sbin/bcfg2-yum-helper
index ba6f30406..7e5c03fd5 100755
--- a/src/sbin/bcfg2-yum-helper
+++ b/src/sbin/bcfg2-yum-helper
@@ -129,7 +129,7 @@ class DepSolver(object):
             err = sys.exc_info()[1]
             self.logger.warning(err)
             return []
-        
+
         if ptype == "default":
             return [p
                     for p, d in list(group.default_packages.items())
@@ -254,6 +254,6 @@ def main():
             rv[gdata['group']] = list(packages)
         print(json.dumps(rv))
 
-        
+
 if __name__ == '__main__':
     sys.exit(main())