[Python-checkins] r86581 - in python/branches/release31-maint: Lib/pstats.py

[senthil.kumaran]

Author: senthil.kumaran
Date: Sat Nov 20 18:08:19 2010
New Revision: 86581

Log:
Merged revisions 86580 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r86580 | senthil.kumaran | 2010-11-21 01:02:50 +0800 (Sun, 21 Nov 2010) | 3 lines
  
  Fix issue10377 - Output from pstats - it is just secs (i.e, wallclock time) and not CPU time.
........


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Lib/pstats.py

Modified: python/branches/release31-maint/Lib/pstats.py
==============================================================================
--- python/branches/release31-maint/Lib/pstats.py	(original)
+++ python/branches/release31-maint/Lib/pstats.py	Sat Nov 20 18:08:19 2010
@@ -358,7 +358,7 @@
         print(indent, self.total_calls, "function calls", end=' ', file=self.stream)
         if self.total_calls != self.prim_calls:
             print("(%d primitive calls)" % self.prim_calls, end=' ', file=self.stream)
-        print("in %.3f CPU seconds" % self.total_tt, file=self.stream)
+        print("in %.3f seconds" % self.total_tt, file=self.stream)
         print(file=self.stream)
         width, list = self.get_print_list(amount)
         if list: