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 e6316b69191b389d330626be04381f2630886e1b..c0cca9d06076983cb8a6c8c51e2c958a913992e3 100644 (file)
--- a/Lib/trace.py
+++ b/Lib/trace.py
@@ -257,7 +257,8 @@ class CoverageResults:
         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 93af0165d2f86bd5fab30f13a03e46fa97ceaed3..d25eb3a04f6b202f667cb1781ff470b988e8671e 100644 (file)
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -60,6 +60,7 @@ Reimer Behrends
 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 6a273d0a8e25771e00032d45e53a1c85557ccd46..a2fa664751d828a32edbb696eb8fb4706eba4038 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -78,6 +78,9 @@ C-API
 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.