diff options
author | Georg Brandl <georg@python.org> | 2010-08-02 17:36:05 (GMT) |
---|---|---|
committer | Georg Brandl <georg@python.org> | 2010-08-02 17:36:05 (GMT) |
commit | e90bce7df7c5457af13fc97dc3178775cd292c70 (patch) | |
tree | a3ddb25c94817c5ffc66f4f5d32a1b85a2d0b23f /Lib/pstats.py | |
parent | bdeff47680e827b5c534af94a0cc0744689b863c (diff) | |
download | cpython-e90bce7df7c5457af13fc97dc3178775cd292c70.zip cpython-e90bce7df7c5457af13fc97dc3178775cd292c70.tar.gz cpython-e90bce7df7c5457af13fc97dc3178775cd292c70.tar.bz2 |
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.
........
Diffstat (limited to 'Lib/pstats.py')
-rw-r--r-- | Lib/pstats.py | 9 |
1 files changed, 7 insertions, 2 deletions
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 @@ 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 |