[Python-checkins] cpython (merge 3.2 -> 3.3): Merge issue #14900: Distuguish call count and primitive call count in pstat

[andrew.svetlov]

http://hg.python.org/cpython/rev/fb216fee32db
changeset:   79572:fb216fee32db
branch:      3.3
parent:      79567:81ad910d75a9
parent:      79571:410e92589164
user:        Andrew Svetlov <andrew.svetlov at gmail.com>
date:        Sun Oct 07 18:59:11 2012 +0300
summary:
  Merge issue #14900: Distuguish call count and primitive call count in pstat output.

Patch by Arne Babenhauserheide.

files:
  Lib/pstats.py |  2 +-
  Misc/ACKS     |  1 +
  2 files changed, 2 insertions(+), 1 deletions(-)


diff --git a/Lib/pstats.py b/Lib/pstats.py
--- a/Lib/pstats.py
+++ b/Lib/pstats.py
@@ -165,7 +165,7 @@
               "module"    : (((4, 1),              ), "file name"),
               "name"      : (((6, 1),              ), "function name"),
               "nfl"       : (((6, 1),(4, 1),(5, 1),), "name/file/line"),
-              "pcalls"    : (((0,-1),              ), "call count"),
+              "pcalls"    : (((0,-1),              ), "primitive call count"),
               "stdname"   : (((7, 1),              ), "standard name"),
               "time"      : (((2,-1),              ), "internal time"),
               }
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -51,6 +51,7 @@
 Aymeric Augustin
 John Aycock
 Donovan Baarda
+Arne Babenhauserheide
 Attila Babo
 Marcin Bachry
 Alfonso Baciero

-- 
Repository URL: http://hg.python.org/cpython