summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorAlexander Belopolsky <alexander.belopolsky@gmail.com>2010-07-21 17:50:34 (GMT)
committerAlexander Belopolsky <alexander.belopolsky@gmail.com>2010-07-21 17:50:34 (GMT)
commiteeec92fd8abf5c5810f3e6d93178c7bbb5e479ec (patch)
treef0b8322e649437715b3bc0ffae58d9e8f04b34a2 /Lib
parent913c52edf31d2f14d076f5e3e7218d09a0934f4d (diff)
downloadcpython-eeec92fd8abf5c5810f3e6d93178c7bbb5e479ec.zip
cpython-eeec92fd8abf5c5810f3e6d93178c7bbb5e479ec.tar.gz
cpython-eeec92fd8abf5c5810f3e6d93178c7bbb5e479ec.tar.bz2
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. ........
Diffstat (limited to 'Lib')
-rw-r--r--Lib/trace.py9
1 files changed, 3 insertions, 6 deletions
diff --git a/Lib/trace.py b/Lib/trace.py
index c0cca9d..49ad7a8 100644
--- a/Lib/trace.py
+++ b/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)
- try:
- script = fp.read()
- finally:
- fp.close()
- t.run('exec(%r)' % (script,))
+ with open(progname) as fp:
+ code = compile(fp.read(), progname, 'exec')
+ t.run(code)
except IOError as err:
_err_exit("Cannot run file %r because: %s" % (sys.argv[0], err))
except SystemExit: