Merged revisions 82997 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r82997 | alexander.belopolsky | 2010-07-20 15:55:18 -0400 (Tue, 20 Jul 2010) | 3 lines
Issue #9282: Fixed --listfuncs option of trace.py. Thanks Eli
Bendersky for the patch.
........
diff --git a/Lib/trace.py b/Lib/trace.py
index e6316b6..c0cca9d 100644
--- a/Lib/trace.py
+++ b/Lib/trace.py
@@ -257,7 +257,8 @@
if self.calledfuncs:
print()
print("functions called:")
- for filename, modulename, funcname in sorted(calls.keys()):
+ calls = self.calledfuncs.keys()
+ for filename, modulename, funcname in sorted(calls):
print(("filename: %s, modulename: %s, funcname: %s"
% (filename, modulename, funcname)))
diff --git a/Misc/ACKS b/Misc/ACKS
index 93af016..d25eb3a 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -60,6 +60,7 @@
Ben Bell
Thomas Bellman
Alexander Belopolsky
+Eli Bendersky
Andrew Bennetts
Andy Bensky
Michel Van den Bergh
diff --git a/Misc/NEWS b/Misc/NEWS
index 6a273d0..a2fa664 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -78,6 +78,9 @@
Library
-------
+- Issue #9282: Fixed --listfuncs option of trace.py. Thanks Eli
+ Bendersky for the patch.
+
- Issue #1555570: email no longer inserts extra blank lines when a \r\n
combo crosses an 8192 byte boundary.