commit 226666667414da863207a8db974fb42ffa018a4e
author Andrew Svetlov <andrew.svetlov@gmail.com> Sun Oct 07 19:21:24 2012 +0300
committer Andrew Svetlov <andrew.svetlov@gmail.com> Sun Oct 07 19:21:24 2012 +0300
tree f44726d51cac898a1bb20a96dba06cf521a5fb92
parent a4018a2afe04ff8f6ae632a66d2dd05677944574
parent 08ab95485b7d94a6a0d09642b36f6a242fba6bd2

merge heads

Lib/pstats.py

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 @@
     # 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 @@
               "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):