From c7b1c99b06a453af879f4768e347ac89000cce42 Mon Sep 17 00:00:00 2001 From: Ned Batchelder Date: Sat, 19 Oct 2013 21:35:33 -0400 Subject: Get rid of our backward implementation of set, sorted, reversed, and rpartition. --HG-- branch : 4.0 --- coverage/misc.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'coverage/misc.py') diff --git a/coverage/misc.py b/coverage/misc.py index 2d2662da..70606287 100644 --- a/coverage/misc.py +++ b/coverage/misc.py @@ -5,7 +5,7 @@ import inspect import os import sys -from coverage.backward import md5, sorted # pylint: disable=W0622 +from coverage.backward import md5 from coverage.backward import string_class, to_bytes -- cgit v1.2.1 From bad63e02b113626a048ea5eb253293c61902e291 Mon Sep 17 00:00:00 2001 From: Ned Batchelder Date: Sat, 19 Oct 2013 22:08:37 -0400 Subject: Generator expressons are ok now. --HG-- branch : 4.0 --- coverage/misc.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'coverage/misc.py') diff --git a/coverage/misc.py b/coverage/misc.py index 70606287..2a36d5c1 100644 --- a/coverage/misc.py +++ b/coverage/misc.py @@ -57,7 +57,7 @@ def format_lines(statements, lines): def short_stack(): """Return a string summarizing the call stack.""" stack = inspect.stack()[:0:-1] - return "\n".join(["%30s : %s @%d" % (t[3],t[1],t[2]) for t in stack]) + return "\n".join("%30s : %s @%d" % (t[3],t[1],t[2]) for t in stack) def expensive(fn): @@ -86,7 +86,7 @@ def bool_or_none(b): def join_regex(regexes): """Combine a list of regexes into one that matches any of them.""" if len(regexes) > 1: - return "|".join(["(%s)" % r for r in regexes]) + return "|".join("(%s)" % r for r in regexes) elif regexes: return regexes[0] else: -- cgit v1.2.1 From 6dfbb755d1f6994ccec9ae56ad7f2eedad2ed0d6 Mon Sep 17 00:00:00 2001 From: Ned Batchelder Date: Sun, 20 Oct 2013 08:23:52 -0400 Subject: Except clause can now use 'as', no need for lots of sys.exc_info --HG-- branch : 4.0 --- coverage/misc.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'coverage/misc.py') diff --git a/coverage/misc.py b/coverage/misc.py index 2a36d5c1..c3fd9e2a 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 -- cgit v1.2.1