summaryrefslogtreecommitdiffstats
path: root/Lib/pstats.py
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2008-01-21 10:24:59 (GMT)
committerGeorg Brandl <georg@python.org>2008-01-21 10:24:59 (GMT)
commit66e7363c10f5e83e4642c7c929f8f45bb660565b (patch)
treed00f004aa198b61e07e3a15af45190a389a1eeb2 /Lib/pstats.py
parent2778c999e39142b6e2f092028e0b05ef29bdb901 (diff)
downloadcpython-66e7363c10f5e83e4642c7c929f8f45bb660565b.zip
cpython-66e7363c10f5e83e4642c7c929f8f45bb660565b.tar.gz
cpython-66e7363c10f5e83e4642c7c929f8f45bb660565b.tar.bz2
#1269: fix a bug in pstats.add_callers() and add a unit test file for pstats.
Diffstat (limited to 'Lib/pstats.py')
-rw-r--r--Lib/pstats.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/Lib/pstats.py b/Lib/pstats.py
index bdbb27e..adaac5c 100644
--- a/Lib/pstats.py
+++ b/Lib/pstats.py
@@ -512,7 +512,8 @@ def add_callers(target, source):
new_callers[func] = caller
for func, caller in source.iteritems():
if func in new_callers:
- new_callers[func] = caller + new_callers[func]
+ new_callers[func] = tuple([i[0] + i[1] for i in
+ zip(caller, new_callers[func])])
else:
new_callers[func] = caller
return new_callers