Merged revisions 83035 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r83035 | alexander.belopolsky | 2010-07-21 13:43:42 -0400 (Wed, 21 Jul 2010) | 3 lines

  Issue #9323: Fixed a bug in trace.py that resulted in loosing the name
  of the script being traced.  Patch by Eli Bendersky.
........

Lib/trace.py

@@ -797,12 +797,9 @@ def main(argv=None):
                   ignoredirs=ignore_dirs, infile=counts_file,
                   outfile=counts_file, timing=timing)
         try:
-            fp = open(progname)
+            with open(progname) as fp:
-            try:
+                code = compile(fp.read(), progname, 'exec')
-                script = fp.read()
+            t.run(code)
-            finally:
-                fp.close()
-            t.run('exec(%r)' % (script,))
         except IOError as err:
             _err_exit("Cannot run file %r because: %s" % (sys.argv[0], err))
         except SystemExit:

Misc/NEWS

@@ -78,6 +78,9 @@ C-API
 Library
 -------
 
+- Issue #9323: Fixed a bug in trace.py that resulted in loosing the
+  name of the script being traced.  Patch by Eli Bendersky.
+
 - Issue #9282: Fixed --listfuncs option of trace.py.  Thanks Eli
   Bendersky for the patch.
 

Misc/maintainers.rst

@@ -212,7 +212,7 @@ timeit
 tkinter             gpolo
 token               georg.brandl
 tokenize
-trace
+trace               alexander.belopolsky
 traceback           georg.brandl
 tty
 turtle              gregorlingl