From: Guido van Rossum <guido@python.org>
Date: Thu, 19 Feb 2004 19:17:08 +0000 (+0000)
Subject: Fix two small bugs: (1) on Windows, pathname munging didn't work
X-Git-Tag: v2.3.4c1~122
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4c4bb6b75e0fbe05b76c824d34f14a1b6b84e8bc;p=thirdparty%2FPython%2Fcpython.git

Fix two small bugs: (1) on Windows, pathname munging didn't work
right; (2) write_results_file() didn't return a tuple of two ints when
it couldn't create the file.  Backport of 1.18.
---

diff --git a/Lib/trace.py b/Lib/trace.py
index 7f412633cf80..424905b5a108 100644
--- a/Lib/trace.py
+++ b/Lib/trace.py
@@ -184,7 +184,9 @@ def fullmodname(path):
         base = path[len(longest) + 1:]
     else:
         base = path
-    base = base.replace("/", ".")
+    base = base.replace(os.sep, ".")
+    if os.altsep:
+        base = base.replace(os.altsep, ".")
     filename, ext = os.path.splitext(base)
     return filename
 
@@ -298,7 +300,7 @@ class CoverageResults:
         except IOError, err:
             print >> sys.stderr, ("trace: Could not open %r for writing: %s"
                                   "- skipping" % (path, err))
-            return
+            return 0, 0
 
         n_lines = 0
         n_hits = 0