diff options
| -rw-r--r-- | Lib/pstats.py | 9 | ||||
| -rw-r--r-- | Lib/test/test_pstats.py | 6 | ||||
| -rw-r--r-- | Misc/NEWS | 3 |
3 files changed, 16 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 diff --git a/Lib/test/test_pstats.py b/Lib/test/test_pstats.py index 095123d..7c28465 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(): @@ -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. |