summaryrefslogtreecommitdiff
path: root/coverage
diff options
context:
space:
mode:
authorNed Batchelder <ned@nedbatchelder.com>2011-08-21 19:25:07 -0400
committerNed Batchelder <ned@nedbatchelder.com>2011-08-21 19:25:07 -0400
commit8a745e7b1820db4642f45893655207b9ef1acf97 (patch)
treec2883d543f2007f71f13a5a164f6e45bd6fdb25f /coverage
parent5f6930a60d495c8433b64529ac2ec321d9f1f13b (diff)
downloadpython-coveragepy-8a745e7b1820db4642f45893655207b9ef1acf97.tar.gz
Cleanups for lint and older Pythons
Diffstat (limited to 'coverage')
-rw-r--r--coverage/data.py3
-rw-r--r--coverage/files.py6
2 files changed, 5 insertions, 4 deletions
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.