mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 08:59:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Merged revisions 83531 via svnmerge from

Browse source 
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.
........
This commit is contained in:
Georg Brandl 2010-08-02 17:36:05 +00:00
parent bdeff47680
commit e90bce7df7
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

@ -521,8 +521,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