mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-07 07:31:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

#7372: fix regression in pstats: a previous fix to handle cProfile data in add_callers broke handling of profile data.

Browse source
This commit is contained in:
Georg Brandl 2010-08-02 17:24:49 +00:00
parent 790f831648
commit 2d3c4e79a1
3 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Lib/pstats.py
View file

@ -506,8 +506,13 @@ def add_callers(target, source):
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