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.
........
diff --git a/Lib/pstats.py b/Lib/pstats.py
index a61e93d..d856245 100644
--- a/Lib/pstats.py
+++ b/Lib/pstats.py
@@ -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