Merged 4.0 to default

1 files changed, 4 insertions, 6 deletions

diff --git a/coverage/misc.py b/coverage/misc.py
index 0378173f..c88d4ecd 100644
--- a/coverage/misc.py
+++ b/coverage/misc.py
@@ -3,9 +3,8 @@
 import errno
 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
 
 
@@ -59,7 +58,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):
@@ -88,7 +87,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:
@@ -99,8 +98,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