From 8a745e7b1820db4642f45893655207b9ef1acf97 Mon Sep 17 00:00:00 2001 From: Ned Batchelder Date: Sun, 21 Aug 2011 19:25:07 -0400 Subject: Cleanups for lint and older Pythons --- coverage/data.py | 3 +-- coverage/files.py | 6 ++++-- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'coverage') diff --git a/coverage/data.py b/coverage/data.py index 1cc4c95..1d6799f 100644 --- a/coverage/data.py +++ b/coverage/data.py @@ -1,10 +1,9 @@ """Coverage data for Coverage.""" -import fnmatch, os, re +import os from coverage.backward import pickle, sorted # pylint: disable=W0622 from coverage.files import PathAliases -from coverage.misc import CoverageException class CoverageData(object): diff --git a/coverage/files.py b/coverage/files.py index f1046ed..23f1bde 100644 --- a/coverage/files.py +++ b/coverage/files.py @@ -162,9 +162,11 @@ class PathAliases(object): pattern_sep = self._sep(pattern) pattern += pattern_sep - # Make a regex from the pattern. fnmatch always adds a \Z to match - # the whole string, which we don't want. + # Make a regex from the pattern. fnmatch always adds a \Z or $ to + # match the whole string, which we don't want. regex_pat = fnmatch.translate(pattern).replace(r'\Z', '') + if regex_pat.endswith("$"): + regex_pat = regex_pat[:-1] regex = re.compile("(?i)" + regex_pat) # Normalize the result: it must end with a path separator. -- cgit v1.2.1