From 16409981082f4271d83f1c1e53aa019851450c12 Mon Sep 17 00:00:00 2001
From: Ben Finney <ben@benfinney.id.au>
Date: Wed, 3 Feb 2010 18:55:03 +1100
Subject: =?UTF-8?q?Use=20=E2=80=98os.path.commonprefix=E2=80=99=20to=20fin?=
 =?UTF-8?q?d=20the=20=E2=80=9Crelative=20directory=E2=80=9D=20at=20the=20s?=
 =?UTF-8?q?tart=20of=20a=20path.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--HG--
branch : use-os-path-module
---
 coverage/files.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/coverage/files.py b/coverage/files.py
index ba228c23..fb597329 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`.
-- 
cgit v1.2.1


From 24bdb1797bc8a29f28d5f7796fc0ffed1cf5c668 Mon Sep 17 00:00:00 2001
From: Ben Finney <ben@benfinney.id.au>
Date: Wed, 3 Feb 2010 18:59:45 +1100
Subject: =?UTF-8?q?Use=20=E2=80=98os.path.join=E2=80=99=20to=20join=20file?=
 =?UTF-8?q?system=20path=20components.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--HG--
branch : use-os-path-module
---
 test/backtest.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/backtest.py b/test/backtest.py
index 12bdbc97..58b16474 100644
--- a/test/backtest.py
+++ b/test/backtest.py
@@ -29,7 +29,8 @@ else:
         if sys.hexversion > 0x03000000 and cmd.startswith("coverage "):
             # We don't have a coverage command on 3.x, so fix it up to call the
             # script. Eventually we won't need this.
-            cmd = "python " + sys.prefix + os.sep + "Scripts" + os.sep + cmd
+            script_path = os.path.join(sys.prefix, "Scripts", cmd)
+            cmd = "python " + script_path
 
         proc = subprocess.Popen(cmd, shell=True,
                 stdin=subprocess.PIPE, stdout=subprocess.PIPE,
-- 
cgit v1.2.1