commit 66e7363c10f5e83e4642c7c929f8f45bb660565b
author Georg Brandl <georg@python.org> Mon Jan 21 10:24:59 2008 +0000
committer Georg Brandl <georg@python.org> Mon Jan 21 10:24:59 2008 +0000
tree d00f004aa198b61e07e3a15af45190a389a1eeb2
parent 2778c999e39142b6e2f092028e0b05ef29bdb901

#1269: fix a bug in pstats.add_callers() and add a unit test file for pstats.

Lib/pstats.py

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 @@
         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