diff options
| author |   Andrew Svetlov <andrew.svetlov@gmail.com> | 2012-10-07 18:59:11 +0300 |
|---|---|---|
| committer | Andrew Svetlov <andrew.svetlov@gmail.com> | 2012-10-07 18:59:11 +0300 |
| commit | a514ea32b25a8c3a72dce3e7f8b411ea0ee24e89 (patch) | |
| tree | e2f31ea5ccb063fc68f59cf5de865c427277017f | |
| parent | Issue #15888: fixing problems in ipaddress doctests. Patch by Chris Jerdonek (diff) | |
| parent | Issue #14900: Distuguish call count and primitive call count in pstat output. (diff) | |
| download | cpython-a514ea32b25a8c3a72dce3e7f8b411ea0ee24e89.tar.gz cpython-a514ea32b25a8c3a72dce3e7f8b411ea0ee24e89.tar.bz2 cpython-a514ea32b25a8c3a72dce3e7f8b411ea0ee24e89.zip | |
Merge issue #14900: Distuguish call count and primitive call count in pstat output.
Patch by Arne Babenhauserheide.
| -rw-r--r-- | Lib/pstats.py | 2 | ||||
| -rw-r--r-- | Misc/ACKS | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Lib/pstats.py b/Lib/pstats.py index 13d944c154a..268cc011f8c 100644 --- a/Lib/pstats.py +++ b/Lib/pstats.py @@ -165,7 +165,7 @@ class Stats: "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 index da7a434fa50..a17cf73dbb8 100644 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -51,6 +51,7 @@ Chris AtLee Aymeric Augustin John Aycock Donovan Baarda +Arne Babenhauserheide Attila Babo Marcin Bachry Alfonso Baciero |