[Checkins] SVN: Sandbox/J1m/pstats2html.py Updated for Python 2.6/cprofile.

[Jim Fulton]

Log message for revision 108384:
  Updated for Python 2.6/cprofile.
  

Changed:
  U   Sandbox/J1m/pstats2html.py

-=-
Modified: Sandbox/J1m/pstats2html.py
===================================================================
--- Sandbox/J1m/pstats2html.py	2010-01-21 20:20:07 UTC (rev 108383)
+++ Sandbox/J1m/pstats2html.py	2010-01-21 20:20:44 UTC (rev 108384)
@@ -1,4 +1,4 @@
-#!/usr/local/bin/python2.4
+#!/usr/local/python/2.6/bin/python
 ##############################################################################
 #
 # Copyright (c) Zope Corporation and Contributors.
@@ -120,7 +120,6 @@
       <tr>
       <th>function</th>
       <th>calls</th>
-      <th>time credited to function</th>
       <th>cummulative time credited to function</th>
       </tr>
 $rows
@@ -156,7 +155,7 @@
              ) in self.stats.iteritems():
             if not calls:
                 continue
-            
+
             t = tree
             t.time += time
             for n in filename.split(delimiter):
@@ -189,7 +188,7 @@
                 simplify_tree(t)
 
         simplify_tree(tree)
-            
+
         def showtree(tree, write, style=''):
             items = sorted(tree.iteritems())
             if items and style:
@@ -210,9 +209,9 @@
 
         results = []
         showtree(tree, results.append)
-                
+
         return tree_template(label=self.label, tree="\n".join(results))
-        
+
     def _table_data(self):
         table = []
         total = 0
@@ -241,7 +240,7 @@
             key = lambda row: -row[sortby]
         else:
             key = lambda row: row[sortby]
-            
+
         data, total = self._table_data()
         return table_template(
             label=self.label,
@@ -278,19 +277,17 @@
             cummulativeper=format(cummulative*1e6/direct_calls),
             callers=[
                 (self.link(*caller), n,
-                 format(time*n/calls),
-                 (caller != key) and format(cummulative*n/direct_calls) or 0,
+                 (caller != key) and format(ct) or 0,
                  )
-                for (caller, n) in sorted(callers.iteritems())
+                for (caller, (n, _, t, ct)) in sorted(callers.iteritems())
                 ],
             callees=[
                 (self.link(*callee), n,
-                 format(n*time_per(stats, callee)),
                  (callee != key)
-                 and format(n*cummulative_per(stats, callee))
+                 and format(ct)
                  or 0,
                  )
-                for (callee, n) in sorted(callees)
+                for (callee, (n, _, t, ct)) in sorted(callees)
                 ],
             )
 
@@ -367,8 +364,8 @@
         return str(int(round(n, l)))
     else:
         return "%%.%sf" % l % n
-        
 
+
 def main(argv=None):
     if argv is None:
         argv = sys.argv[1:]