Remove blanket excepts from plugins and lint

This removes most blanket except: clauses from all plugins, including
the base plugin libraries, and bcfg2-lint. The few that remain should
all be necessary.

Most of the changes were quite minor, but this did require some
restructuring of the CfgPrivateKeyCreator; as a result, the tests for
that module were rewritten.

1 files changed, 2 insertions, 6 deletions

diff --git a/src/lib/Bcfg2/Server/Plugins/Pkgmgr.py b/src/lib/Bcfg2/Server/Plugins/Pkgmgr.py
index c7d8986ed..7c6ab0ed7 100644
--- a/src/lib/Bcfg2/Server/Plugins/Pkgmgr.py
+++ b/src/lib/Bcfg2/Server/Plugins/Pkgmgr.py
@@ -35,7 +35,7 @@ class FuzzyDict(dict):
     def get(self, key, default=None):
         try:
             return self.__getitem__(key)
-        except:
+        except KeyError:
             if default:
                 return default
             raise
@@ -182,11 +182,7 @@ class PNode(object):
         """Return a dictionary of package mappings."""
         if self.predicate(metadata, entry):
             for key in self.contents:
-                try:
-                    data[key].update(self.contents[key])
-                except:  # pylint: disable=W0702
-                    data[key] = FuzzyDict()
-                    data[key].update(self.contents[key])
+                data.setdefault(key, FuzzyDict).update(self.contents[key])
             for child in self.children:
                 child.Match(metadata, data)