diff options
| author | Georg Brandl <georg@python.org> | 2010-08-02 17:24:49 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2010-08-02 17:24:49 (GMT) |
| commit | 2d3c4e79a19d8052d756575775a643a7107dced7 (patch) | |
| tree | 09c4bfd9b48e66353b4346bebc35a72527638e11 /Lib/pstats.py | |
| parent | 790f8316486d890f7c9b0fb9ab67d8120f4112ac (diff) | |
| download | cpython-2d3c4e79a19d8052d756575775a643a7107dced7.zip cpython-2d3c4e79a19d8052d756575775a643a7107dced7.tar.gz cpython-2d3c4e79a19d8052d756575775a643a7107dced7.tar.bz2 | |
#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 3740d92..4bb5cf1 100644 --- a/Lib/pstats.py +++ b/Lib/pstats.py @@ -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 |