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/Lint | |
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/Lint')
-rw-r--r-- | src/lib/Bcfg2/Server/Lint/GroupPatterns.py | 5 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Lint/__init__.py | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/lib/Bcfg2/Server/Lint/GroupPatterns.py b/src/lib/Bcfg2/Server/Lint/GroupPatterns.py index deb91020d..e9813b7e9 100644 --- a/src/lib/Bcfg2/Server/Lint/GroupPatterns.py +++ b/src/lib/Bcfg2/Server/Lint/GroupPatterns.py @@ -4,7 +4,8 @@ import sys from Bcfg2.Server.Lint import ServerPlugin -from Bcfg2.Server.Plugins.GroupPatterns import PatternMap +from Bcfg2.Server.Plugins.GroupPatterns import PatternMap, \ + PatternInitializationError class GroupPatterns(ServerPlugin): @@ -36,7 +37,7 @@ class GroupPatterns(ServerPlugin): PatternMap(pat, None, groups) else: PatternMap(None, pat, groups) - except: # pylint: disable=W0702 + except PatternInitializationError: err = sys.exc_info()[1] self.LintError("pattern-fails-to-initialize", "Failed to initialize %s %s for %s: %s" % diff --git a/src/lib/Bcfg2/Server/Lint/__init__.py b/src/lib/Bcfg2/Server/Lint/__init__.py index 903ee6326..61f704206 100644 --- a/src/lib/Bcfg2/Server/Lint/__init__.py +++ b/src/lib/Bcfg2/Server/Lint/__init__.py @@ -26,7 +26,7 @@ def _ioctl_GWINSZ(fd): # pylint: disable=C0103 from the given file descriptor """ try: return struct.unpack('hh', fcntl.ioctl(fd, termios.TIOCGWINSZ, '1234')) - except: # pylint: disable=W0702 + except (IOError, struct.error): return None @@ -40,7 +40,7 @@ def get_termsize(): fd = os.open(os.ctermid(), os.O_RDONLY) dims = _ioctl_GWINSZ(fd) os.close(fd) - except: # pylint: disable=W0702 + except IOError: pass if not dims: try: |