diff options
author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2015-02-18 08:47:30 -0600 |
---|---|---|
committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2015-02-18 08:47:30 -0600 |
commit | db4a3b0426f4912639c142366ff27594d54ce360 (patch) | |
tree | fe258d4b663b9607230e456cfa25cdfe29cb3a70 /src/lib/Bcfg2/Server/Plugin/helpers.py | |
parent | ed9920711a6020fa01d564db34e0ee4800718cc6 (diff) | |
parent | 89e7afbf74ffbbb54dd892bf2c4245aedee2a832 (diff) | |
download | bcfg2-db4a3b0426f4912639c142366ff27594d54ce360.tar.gz bcfg2-db4a3b0426f4912639c142366ff27594d54ce360.tar.bz2 bcfg2-db4a3b0426f4912639c142366ff27594d54ce360.zip |
Merge pull request #250 from stpierre/blanket-except-plugins-lint
Remove blanket excepts from plugins and lint
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugin/helpers.py')
-rw-r--r-- | src/lib/Bcfg2/Server/Plugin/helpers.py | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/lib/Bcfg2/Server/Plugin/helpers.py b/src/lib/Bcfg2/Server/Plugin/helpers.py index 2aab231c6..5cfc8998c 100644 --- a/src/lib/Bcfg2/Server/Plugin/helpers.py +++ b/src/lib/Bcfg2/Server/Plugin/helpers.py @@ -266,7 +266,7 @@ class FileBacked(Debuggable): self.fam = Bcfg2.Server.FileMonitor.get_fam() def HandleEvent(self, event=None): - """ HandleEvent is called whenever the FAM registers an event. + """HandleEvent is called whenever the FAM registers an event. :param event: The event object :type event: Bcfg2.Server.FileMonitor.Event @@ -276,13 +276,11 @@ class FileBacked(Debuggable): return try: self.data = open(self.name).read() - self.Index() except IOError: err = sys.exc_info()[1] self.logger.error("Failed to read file %s: %s" % (self.name, err)) - except: - err = sys.exc_info()[1] - self.logger.error("Failed to parse file %s: %s" % (self.name, err)) + + self.Index() def Index(self): """ Index() is called by :func:`HandleEvent` every time the @@ -1196,7 +1194,7 @@ class SpecificData(Debuggable): self.data = open(self.name).read() except UnicodeDecodeError: self.data = open(self.name, mode='rb').read() - except: # pylint: disable=W0201 + except IOError: self.logger.error("Failed to read file %s" % self.name) |