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

diff --git a/Lib/pstats.py b/Lib/pstats.py
index 81d9d0d58cb9537f0ba985282cb646599eb351ae..db16628adc73567d9bba02fdc2048f1e563414ab 100644 (file)
--- a/Lib/pstats.py
+++ b/Lib/pstats.py
@@ -358,7 +358,7 @@ class Stats:
         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: