3 files changed, 17 insertions, 7 deletions
diff --git a/src/sbin/bcfg2-admin b/src/sbin/bcfg2-admin
index c5c03c4cd..2d6ba4f5a 100755
--- a/src/sbin/bcfg2-admin
+++ b/src/sbin/bcfg2-admin
@@ -4,7 +4,6 @@
 from optparse import OptionParser
 from StringIO import StringIO
 import logging
-import sys
 import Bcfg2.Server.Core
 import Bcfg2.Logger
 import Bcfg2.Options
@@ -39,10 +38,13 @@ def create_description():
 
 def main():
     Bcfg2.Logger.setup_logging('bcfg2-admin', to_console=True, level=40)
-    usage="Usage: %prog [options] MODE [args]"
+    usage = "Usage: %prog [options] MODE [args]"
     parser = OptionParser(usage=usage)
     parser.set_defaults(configfile=Bcfg2.Options.CFILE.default)
-    parser.add_option("-C", "--configfile", dest="configfile", help="Path to bcfg2.conf", metavar="FILE")
+    parser.add_option("-C", "--configfile",
+                      dest="configfile",
+                      help="Path to bcfg2.conf",
+                      metavar="FILE")
     parser.disable_interspersed_args()
     (options, args) = parser.parse_args()
 
diff --git a/src/sbin/bcfg2-info b/src/sbin/bcfg2-info
index 31a5ff0f9..676311211 100755
--- a/src/sbin/bcfg2-info
+++ b/src/sbin/bcfg2-info
@@ -2,10 +2,19 @@
 '''This tool loads the Bcfg2 core into an interactive debugger'''
 __revision__ = '$Revision$'
 
-import copy, logging, lxml.etree, sys, cmd, time, tempfile, profile, pstats
-import Bcfg2.Logger, Bcfg2.Server.Core, os
-import Bcfg2.Server.Plugins.Metadata, Bcfg2.Server.Plugin
+import cmd
+import logging
+import lxml.etree
+import os
+import profile
+import pstats
+import sys
+import tempfile
+import Bcfg2.Logger
 import Bcfg2.Options
+import Bcfg2.Server.Core
+import Bcfg2.Server.Plugins.Metadata
+import Bcfg2.Server.Plugin
 
 logger = logging.getLogger('bcfg2-info')
 
diff --git a/src/sbin/bcfg2-server b/src/sbin/bcfg2-server
index e5ea5c184..06ad53768 100755
--- a/src/sbin/bcfg2-server
+++ b/src/sbin/bcfg2-server
@@ -5,7 +5,6 @@ __revision__ = '$Revision$'
 
 import logging
 import sys
-from xmlrpclib import Fault
 
 import Bcfg2.Logger
 import Bcfg2.Options