diff options
Diffstat (limited to 'coverage')
| -rw-r--r-- | coverage/cmdline.py | 9 | ||||
| -rw-r--r-- | coverage/control.py | 3 | ||||
| -rw-r--r-- | coverage/execfile.py | 3 | ||||
| -rw-r--r-- | coverage/misc.py | 4 | ||||
| -rw-r--r-- | coverage/parser.py | 11 |
5 files changed, 10 insertions, 20 deletions
diff --git a/coverage/cmdline.py b/coverage/cmdline.py index 9ff29f3..9373283 100644 --- a/coverage/cmdline.py +++ b/coverage/cmdline.py @@ -716,21 +716,18 @@ def main(argv=None): argv = sys.argv[1:] try: status = CoverageScript().command_line(argv) - except ExceptionDuringRun: + except ExceptionDuringRun as err: # An exception was caught while running the product code. The # sys.exc_info() return tuple is packed into an ExceptionDuringRun # exception. - _, err, _ = sys.exc_info() traceback.print_exception(*err.args) status = ERR - except CoverageException: + except CoverageException as err: # A controlled error inside coverage.py: print the message to the user. - _, err, _ = sys.exc_info() print(err) status = ERR - except SystemExit: + except SystemExit as err: # The user called `sys.exit()`. Exit with their argument, if any. - _, err, _ = sys.exc_info() if err.args: status = err.args[0] else: diff --git a/coverage/control.py b/coverage/control.py index 466f76d..51ff043 100644 --- a/coverage/control.py +++ b/coverage/control.py @@ -98,8 +98,7 @@ class coverage(object): config_file = ".coveragerc" try: self.config.from_file(config_file) - except ValueError: - _, err, _ = sys.exc_info() + except ValueError as err: raise CoverageException( "Couldn't read config file %s: %s" % (config_file, err) ) diff --git a/coverage/execfile.py b/coverage/execfile.py index aec6534..f90096e 100644 --- a/coverage/execfile.py +++ b/coverage/execfile.py @@ -56,8 +56,7 @@ def run_python_module(modulename, args): package = __import__(packagename, glo, loc, ['__path__']) searchpath = package.__path__ openfile, pathname, _ = imp.find_module(name, searchpath) - except ImportError: - _, err, _ = sys.exc_info() + except ImportError as err: raise NoSource(str(err)) finally: if openfile: diff --git a/coverage/misc.py b/coverage/misc.py index 2a36d5c..c3fd9e2 100644 --- a/coverage/misc.py +++ b/coverage/misc.py @@ -3,7 +3,6 @@ import errno import inspect import os -import sys from coverage.backward import md5 from coverage.backward import string_class, to_bytes @@ -97,8 +96,7 @@ def file_be_gone(path): """Remove a file, and don't get annoyed if it doesn't exist.""" try: os.remove(path) - except OSError: - _, e, _ = sys.exc_info() + except OSError as e: if e.errno != errno.ENOENT: raise diff --git a/coverage/parser.py b/coverage/parser.py index d0fe997..7e19470 100644 --- a/coverage/parser.py +++ b/coverage/parser.py @@ -1,6 +1,6 @@ """Code parsing for Coverage.""" -import collections, dis, re, sys, token, tokenize +import collections, dis, re, token, tokenize from coverage.backward import StringIO from coverage.backward import open_source, range # pylint: disable=W0622 @@ -27,8 +27,7 @@ class CodeParser(object): try: with open_source(self.filename) as sourcef: self.text = sourcef.read() - except IOError: - _, err, _ = sys.exc_info() + except IOError as err: raise NoSource( "No source for code: '%s': %s" % (self.filename, err) ) @@ -202,8 +201,7 @@ class CodeParser(object): """ try: self._raw_parse() - except (tokenize.TokenError, IndentationError): - _, tokerr, _ = sys.exc_info() + except (tokenize.TokenError, IndentationError) as tokerr: msg, lineno = tokerr.args raise NotPython( "Couldn't parse '%s' as Python source: '%s' at %s" % @@ -333,8 +331,7 @@ class ByteParser(object): # Python 2.3 and 2.4 don't like partial last lines, so be sure # the text ends nicely for them. self.code = compile(text + '\n', filename, "exec") - except SyntaxError: - _, synerr, _ = sys.exc_info() + except SyntaxError as synerr: raise NotPython( "Couldn't parse '%s' as Python source: '%s' at line %d" % (filename, synerr.msg, synerr.lineno) |