From e8ce26b98008e60f2116409600c9e3206cb6f109 Mon Sep 17 00:00:00 2001 From: Ned Batchelder Date: Sat, 20 Sep 2014 12:40:14 -0400 Subject: Get rid of some backward stuff we no longer need --- 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 4b1dccb2..48727478 100644 --- a/coverage/misc.py +++ b/coverage/misc.py @@ -1,10 +1,10 @@ """Miscellaneous stuff for Coverage.""" import errno +import hashlib import inspect import os -from coverage.backward import md5 from coverage.backward import string_class, to_bytes @@ -106,7 +106,7 @@ def file_be_gone(path): class Hasher(object): """Hashes Python data into md5.""" def __init__(self): - self.md5 = md5() + self.md5 = hashlib.md5() def update(self, v): """Add `v` to the hash, recursively if needed.""" -- cgit v1.2.1 From d68b95f7a0a201b2e8e830b6d4769005ef0223fa Mon Sep 17 00:00:00 2001 From: Ned Batchelder Date: Sun, 21 Sep 2014 21:45:53 -0400 Subject: On Windows, we need file matching to be case-insensitive. --- coverage/misc.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'coverage/misc.py') diff --git a/coverage/misc.py b/coverage/misc.py index 48727478..6962ae32 100644 --- a/coverage/misc.py +++ b/coverage/misc.py @@ -86,12 +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) - elif regexes: - return regexes[0] - else: - return "" + return "|".join("(?:%s)" % r for r in regexes) def file_be_gone(path): -- cgit v1.2.1