diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2014-12-09 11:10:24 -0600 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2015-02-18 08:24:24 -0600 |
| commit | 89e7afbf74ffbbb54dd892bf2c4245aedee2a832 (patch) | |
| tree | ed4623b5c6e39d80c132e9f21f3d4804cabd93be /src/lib/Bcfg2/Server/Plugins/Probes.py | |
| parent | 64b458b380620f84843b1841b441745a0984946f (diff) | |
| download | bcfg2-89e7afbf74ffbbb54dd892bf2c4245aedee2a832.tar.gz bcfg2-89e7afbf74ffbbb54dd892bf2c4245aedee2a832.tar.bz2 bcfg2-89e7afbf74ffbbb54dd892bf2c4245aedee2a832.zip | |
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.
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins/Probes.py')
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Probes.py | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Probes.py b/src/lib/Bcfg2/Server/Plugins/Probes.py index 21d50ace6..76aab69b5 100644 --- a/src/lib/Bcfg2/Server/Plugins/Probes.py +++ b/src/lib/Bcfg2/Server/Plugins/Probes.py @@ -405,7 +405,7 @@ class ProbeSet(Bcfg2.Server.Plugin.EntrySet): else: try: probe.text = entry.data - except: # pylint: disable=W0702 + except ValueError: self.logger.error("Client unable to handle unicode " "probes. Skipping %s" % probe.get('name')) @@ -447,12 +447,7 @@ class Probes(Bcfg2.Server.Plugin.Probing, Bcfg2.Server.Plugin.Connector.__init__(self) Bcfg2.Server.Plugin.DatabaseBacked.__init__(self, core) - try: - self.probes = ProbeSet(self.data, self.name) - except: - err = sys.exc_info()[1] - raise Bcfg2.Server.Plugin.PluginInitError(err) - + self.probes = ProbeSet(self.data, self.name) if self._use_db: self.probestore = DBProbeStore(core, self.data) else: |