Merged Ben Finney's use-os-path-module fixes (again?)

1 files changed, 4 insertions, 2 deletions

diff --git a/coverage/files.py b/coverage/files.py
index bf60f8b4..ace47c1f 100644
--- a/coverage/files.py
+++ b/coverage/files.py
@@ -6,7 +6,7 @@ class FileLocator(object):
     """Understand how filenames work."""
 
     def __init__(self):
-        self.relative_dir = self.abs_file(os.curdir) + os.sep
+        self.relative_dir = self.abs_file(os.curdir)
 
         # Cache of results of calling the canonical_filename() method, to
         # avoid duplicating work.
@@ -23,7 +23,9 @@ class FileLocator(object):
         FileLocator was constructed.
 
         """
-        return filename.replace(self.relative_dir, "")
+        common_prefix = os.path.commonprefix(
+            [filename, self.relative_dir + os.sep])
+        return filename[len(common_prefix):]
 
     def canonical_filename(self, filename):
         """Return a canonical filename for `filename`.