summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorAndrew Svetlov <andrew.svetlov@gmail.com>2012-10-07 16:22:50 (GMT)
committerAndrew Svetlov <andrew.svetlov@gmail.com>2012-10-07 16:22:50 (GMT)
commit81901490a021048dc452c92839016732dc3c2e23 (patch)
tree509ade3689663c1eaa3af44719ebe957299bd46e /Lib
parent58f11831feddd2d0617b2300028f3fcb2c8e9762 (diff)
parent226666667414da863207a8db974fb42ffa018a4e (diff)
downloadcpython-81901490a021048dc452c92839016732dc3c2e23.zip
cpython-81901490a021048dc452c92839016732dc3c2e23.tar.gz
cpython-81901490a021048dc452c92839016732dc3c2e23.tar.bz2
merge heads
Diffstat (limited to 'Lib')
-rw-r--r--Lib/pstats.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/Lib/pstats.py b/Lib/pstats.py
index 268cc01..6a77605 100644
--- a/Lib/pstats.py
+++ b/Lib/pstats.py
@@ -159,8 +159,11 @@ class Stats:
# along with some printable description
sort_arg_dict_default = {
"calls" : (((1,-1), ), "call count"),
+ "ncalls" : (((1,-1), ), "call count"),
+ "cumtime" : (((3,-1), ), "cumulative time"),
"cumulative": (((3,-1), ), "cumulative time"),
"file" : (((4, 1), ), "file name"),
+ "filename" : (((4, 1), ), "file name"),
"line" : (((5, 1), ), "line number"),
"module" : (((4, 1), ), "file name"),
"name" : (((6, 1), ), "function name"),
@@ -168,6 +171,7 @@ class Stats:
"pcalls" : (((0,-1), ), "primitive call count"),
"stdname" : (((7, 1), ), "standard name"),
"time" : (((2,-1), ), "internal time"),
+ "tottime" : (((2,-1), ), "internal time"),
}
def get_sort_arg_defs(self):