From 2d3c4e79a19d8052d756575775a643a7107dced7 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Mon, 2 Aug 2010 17:24:49 +0000
Subject: [PATCH] #7372: fix regression in pstats: a previous fix to handle
 cProfile data in add_callers broke handling of profile data.

---
 Lib/pstats.py           | 9 +++++++--
 Lib/test/test_pstats.py | 6 ++++++
 Misc/NEWS               | 3 +++
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/Lib/pstats.py b/Lib/pstats.py
index 3740d92c53e..4bb5cf17064 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
diff --git a/Lib/test/test_pstats.py b/Lib/test/test_pstats.py
index 095123d881d..7c28465c3b7 100644
--- a/Lib/test/test_pstats.py
+++ b/Lib/test/test_pstats.py
@@ -10,10 +10,16 @@ class AddCallersTestCase(unittest.TestCase):
     def test_combine_results(self):
         """pstats.add_callers should combine the call results of both target
         and source by adding the call time. See issue1269."""
+        # new format: used by the cProfile module
         target = {"a": (1, 2, 3, 4)}
         source = {"a": (1, 2, 3, 4), "b": (5, 6, 7, 8)}
         new_callers = pstats.add_callers(target, source)
         self.assertEqual(new_callers, {'a': (2, 4, 6, 8), 'b': (5, 6, 7, 8)})
+        # old format: used by the profile module
+        target = {"a": 1}
+        source = {"a": 1, "b": 5}
+        new_callers = pstats.add_callers(target, source)
+        self.assertEqual(new_callers, {'a': 2, 'b': 5})
 
 
 def test_main():
diff --git a/Misc/NEWS b/Misc/NEWS
index 5fb7cc2f008..3797380428b 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -29,6 +29,9 @@ Extensions
 Library
 -------
 
+- Issue #7372: Fix pstats regression when stripping paths from profile
+  data generated with the profile module.
+
 - Issue #9428: Fix running scripts with the profile/cProfile modules from
   the command line.