commit a514ea32b25a8c3a72dce3e7f8b411ea0ee24e89
author Andrew Svetlov <andrew.svetlov@gmail.com> Sun Oct 07 18:59:11 2012 +0300
committer Andrew Svetlov <andrew.svetlov@gmail.com> Sun Oct 07 18:59:11 2012 +0300
tree e2f31ea5ccb063fc68f59cf5de865c427277017f
parent 948af23a77c41bfa77da89aa138d8a4f4111df99
parent 2ef4584e6d94e032e3922ee350c8b399924baeba

Merge issue #14900: Distuguish call count and primitive call count in pstat output.

Patch by Arne Babenhauserheide.

Lib/pstats.py

diff --git a/Lib/pstats.py b/Lib/pstats.py
index 13d944c..268cc01 100644
--- 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"),
               }

Misc/ACKS

diff --git a/Misc/ACKS b/Misc/ACKS
index da7a434..a17cf73 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -51,6 +51,7 @@
 Aymeric Augustin
 John Aycock
 Donovan Baarda
+Arne Babenhauserheide
 Attila Babo
 Marcin Bachry
 Alfonso Baciero