Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31974 Modified Files: Tag: release23-maint trace.py Log Message: 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. Index: trace.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/trace.py,v retrieving revision 1.12.6.1 retrieving revision 1.12.6.2 diff -C2 -d -r1.12.6.1 -r1.12.6.2 *** trace.py 18 Dec 2003 09:43:33 -0000 1.12.6.1 --- trace.py 19 Feb 2004 19:17:08 -0000 1.12.6.2 *************** *** 185,189 **** else: base = path ! base = base.replace("/", ".") filename, ext = os.path.splitext(base) return filename --- 185,191 ---- else: base = path ! base = base.replace(os.sep, ".") ! if os.altsep: ! base = base.replace(os.altsep, ".") filename, ext = os.path.splitext(base) return filename *************** *** 299,303 **** print >> sys.stderr, ("trace: Could not open %r for writing: %s" "- skipping" % (path, err)) ! return n_lines = 0 --- 301,305 ---- print >> sys.stderr, ("trace: Could not open %r for writing: %s" "- skipping" % (path, err)) ! return 0, 0 n_lines = 0