summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Belopolsky <alexander.belopolsky@gmail.com>2010-07-21 17:43:42 (GMT)
committerAlexander Belopolsky <alexander.belopolsky@gmail.com>2010-07-21 17:43:42 (GMT)
commit3f8ecab589f9fab22a1d067a79aa6666568704b1 (patch)
treee6638915246c1912d158bad234404f587321df9c
parent8cb6dbf1b9d606de4ef1b3c4141ae186d32492db (diff)
downloadcpython-3f8ecab589f9fab22a1d067a79aa6666568704b1.zip
cpython-3f8ecab589f9fab22a1d067a79aa6666568704b1.tar.gz
cpython-3f8ecab589f9fab22a1d067a79aa6666568704b1.tar.bz2
Issue #9323: Fixed a bug in trace.py that resulted in loosing the name
of the script being traced. Patch by Eli Bendersky.
-rw-r--r--Lib/trace.py9
-rw-r--r--Misc/NEWS3
-rw-r--r--Misc/maintainers.rst2
3 files changed, 7 insertions, 7 deletions
diff --git a/Lib/trace.py b/Lib/trace.py
index 19fdbaa..077cdc1 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:
diff --git a/Misc/NEWS b/Misc/NEWS
index ebca774..ef7988f 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -473,6 +473,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.
diff --git a/Misc/maintainers.rst b/Misc/maintainers.rst
index fd71f28..d1d8fcc 100644
--- a/Misc/maintainers.rst
+++ b/Misc/maintainers.rst
@@ -212,7 +212,7 @@ timeit
tkinter gpolo
token georg.brandl
tokenize
-trace
+trace alexander.belopolsky
traceback georg.brandl
tty
turtle gregorlingl