[Python-checkins] r82999 - in python/branches/release31-maint: Lib/trace.py Misc/ACKS Misc/NEWS

[alexander.belopolsky]

Author: alexander.belopolsky
Date: Tue Jul 20 22:13:45 2010
New Revision: 82999

Log:
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.
........


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Lib/trace.py
   python/branches/release31-maint/Misc/ACKS
   python/branches/release31-maint/Misc/NEWS

Modified: python/branches/release31-maint/Lib/trace.py
==============================================================================
--- python/branches/release31-maint/Lib/trace.py	(original)
+++ python/branches/release31-maint/Lib/trace.py	Tue Jul 20 22:13:45 2010
@@ -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)))
 

Modified: python/branches/release31-maint/Misc/ACKS
==============================================================================
--- python/branches/release31-maint/Misc/ACKS	(original)
+++ python/branches/release31-maint/Misc/ACKS	Tue Jul 20 22:13:45 2010
@@ -60,6 +60,7 @@
 Ben Bell
 Thomas Bellman
 Alexander Belopolsky
+Eli Bendersky
 Andrew Bennetts
 Andy Bensky
 Michel Van den Bergh

Modified: python/branches/release31-maint/Misc/NEWS
==============================================================================
--- python/branches/release31-maint/Misc/NEWS	(original)
+++ python/branches/release31-maint/Misc/NEWS	Tue Jul 20 22:13:45 2010
@@ -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.