From 3ed8637d59fcfe7b38aaa3f8717b0269d2c4650c Mon Sep 17 00:00:00 2001
From: "Chris St. Pierre" <chris.a.st.pierre@gmail.com>
Date: Mon, 3 Jun 2013 13:16:21 -0400
Subject: fixed unit tests

---
 src/lib/Bcfg2/Server/Admin/Minestruct.py | 4 ++--
 src/lib/Bcfg2/Server/Admin/Pull.py       | 2 +-
 src/lib/Bcfg2/Server/Admin/Xcmd.py       | 1 -
 src/sbin/bcfg2-lint                      | 3 ++-
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/lib/Bcfg2/Server/Admin/Minestruct.py b/src/lib/Bcfg2/Server/Admin/Minestruct.py
index 21a56de23..37ca74894 100644
--- a/src/lib/Bcfg2/Server/Admin/Minestruct.py
+++ b/src/lib/Bcfg2/Server/Admin/Minestruct.py
@@ -20,7 +20,7 @@ class Minestruct(Bcfg2.Server.Admin.StructureMode):
                          "Please see bcfg2-admin minestruct help for usage.")
         try:
             (opts, args) = getopt.getopt(args, 'f:g:h')
-        except:
+        except getopt.GetoptError:
             self.errExit(self.__doc__)
 
         client = args[0]
@@ -41,7 +41,7 @@ class Minestruct(Bcfg2.Server.Admin.StructureMode):
             for source in self.bcore.plugins_by_type(PullSource):
                 for item in source.GetExtra(client):
                     extra.add(item)
-        except:
+        except:  # pylint: disable=W0702
             self.errExit("Failed to find extra entry info for client %s" %
                          client)
         root = lxml.etree.Element("Base")
diff --git a/src/lib/Bcfg2/Server/Admin/Pull.py b/src/lib/Bcfg2/Server/Admin/Pull.py
index cc0dced82..459fcec65 100644
--- a/src/lib/Bcfg2/Server/Admin/Pull.py
+++ b/src/lib/Bcfg2/Server/Admin/Pull.py
@@ -32,7 +32,7 @@ class Pull(Bcfg2.Server.Admin.MetadataCore):
         use_stdin = False
         try:
             opts, gargs = getopt.getopt(args, 'vfIs')
-        except:
+        except getopt.GetoptError:
             self.errExit(self.__doc__)
         for opt in opts:
             if opt[0] == '-v':
diff --git a/src/lib/Bcfg2/Server/Admin/Xcmd.py b/src/lib/Bcfg2/Server/Admin/Xcmd.py
index e3173e20a..036129a1b 100644
--- a/src/lib/Bcfg2/Server/Admin/Xcmd.py
+++ b/src/lib/Bcfg2/Server/Admin/Xcmd.py
@@ -4,7 +4,6 @@ import sys
 import Bcfg2.Options
 import Bcfg2.Proxy
 import Bcfg2.Server.Admin
-from Bcfg2.Compat import xmlrpclib
 
 
 class Xcmd(Bcfg2.Server.Admin.Mode):
diff --git a/src/sbin/bcfg2-lint b/src/sbin/bcfg2-lint
index 9abec31a5..ab3b6450f 100755
--- a/src/sbin/bcfg2-lint
+++ b/src/sbin/bcfg2-lint
@@ -55,7 +55,8 @@ def run_plugin(plugin, plugin_name, setup=None, errorhandler=None,
     # python 2.5 doesn't support mixing *magic and keyword arguments
     start = time.time()
     rv = plugin(*args, **dict(files=files, errorhandler=errorhandler)).Run()
-    LOGGER.debug("  Ran %s in %0.2f seconds" % (plugin_name, time.time() - start))
+    LOGGER.debug("  Ran %s in %0.2f seconds" % (plugin_name,
+                                                time.time() - start))
     return rv
 
 
-- 
cgit v1.2.3-1-g7c22