diff options
author | Ned Batchelder <ned@nedbatchelder.com> | 2018-01-23 07:22:23 -0500 |
---|---|---|
committer | Ned Batchelder <ned@nedbatchelder.com> | 2018-01-23 07:22:23 -0500 |
commit | 0222536475d57b85366c46472640bf8fc765215e (patch) | |
tree | e24454a29a985ed1b963813a7ba515f89be80940 /coverage | |
parent | f217de1d181b8df05402fa65a9a0842aa3814dba (diff) | |
download | python-coveragepy-0222536475d57b85366c46472640bf8fc765215e.tar.gz |
Simplify the aliases structure
Diffstat (limited to 'coverage')
-rw-r--r-- | coverage/files.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/coverage/files.py b/coverage/files.py index e746c3b..759ec2c 100644 --- a/coverage/files.py +++ b/coverage/files.py @@ -312,7 +312,7 @@ class PathAliases(object): def pprint(self): # pragma: debugging """Dump the important parts of the PathAliases, for debugging.""" - for regex, result, _, _ in self.aliases: + for regex, result in self.aliases: print("{0!r} --> {1!r}".format(regex.pattern, result)) def add(self, pattern, result): @@ -359,7 +359,7 @@ class PathAliases(object): # Normalize the result: it must end with a path separator. result_sep = sep(result) result = result.rstrip(r"\/") + result_sep - self.aliases.append((regex, result, pattern_sep, result_sep)) + self.aliases.append((regex, result)) def map(self, path): """Map `path` through the aliases. @@ -377,11 +377,11 @@ class PathAliases(object): of `path` unchanged. """ - for regex, result, pattern_sep, result_sep in self.aliases: + for regex, result in self.aliases: m = regex.match(path) if m: new = path.replace(m.group(0), result) - new = new.replace(sep(path), result_sep) + new = new.replace(sep(path), sep(result)) new = canonical_filename(new) return new return path |