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. Will backport.
diff --git a/Lib/trace.py b/Lib/trace.py
index 8a31d8e..8be4f24 100644
--- a/Lib/trace.py
+++ b/Lib/trace.py
@@ -183,7 +183,9 @@
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
@@ -297,7 +299,7 @@
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