From 89e7afbf74ffbbb54dd892bf2c4245aedee2a832 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Tue, 9 Dec 2014 11:10:24 -0600 Subject: 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. --- src/lib/Bcfg2/Server/Lint/GroupPatterns.py | 5 +++-- src/lib/Bcfg2/Server/Lint/__init__.py | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'src/lib/Bcfg2/Server/Lint') 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: -- cgit v1.2.3-1-g7c22