Mercurial > cpython-lru_cache-weakref

diff Lib/pstats.py @ 63550:3068e00a3207 3.1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged revisions 83531 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r83531 | georg.brandl | 2010-08-02 19:24:49 +0200 (Mo, 02 Aug 2010) | 1 line #7372: fix regression in pstats: a previous fix to handle cProfile data in add_callers broke handling of profile data. ........
author Georg Brandl <georg@python.org>
date Mon, 02 Aug 2010 17:36:05 +0000
parents bc66e1566a19
children b9a75dd7420d
line wrap: on
line diff
--- a/Lib/pstats.py	Mon Aug 02 17:11:50 2010 +0000
+++ b/Lib/pstats.py	Mon Aug 02 17:36:05 2010 +0000
@@ -521,8 +521,13 @@
         new_callers[func] = caller
     for func, caller in source.items():
         if func in new_callers:
-            new_callers[func] = tuple([i[0] + i[1] for i in
-                                       zip(caller, new_callers[func])])
+            if isinstance(caller, tuple):
+                # format used by cProfile
+                new_callers[func] = tuple([i[0] + i[1] for i in
+                                           zip(caller, new_callers[func])])
+            else:
+                # format used by profile
+                new_callers[func] += caller
         else:
             new_callers[func] = caller
     return new_callers