From a2a92cf2c0aa6ace3202c3c61b8768a5e84f5335 Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Mon, 2 Aug 2010 17:34:58 +0000 Subject: Merged revisions 83531 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r83531 | georg.brandl | 2010-08-02 19:24:49 +0200 (Mo, 02 Aug 2010) | 1 line #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 59dcf26..a210261 100644 --- a/Lib/pstats.py +++ b/Lib/pstats.py @@ -513,8 +513,13 @@ def add_callers(target, source): new_callers[func] = caller for func, caller in source.iteritems(): 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 660316b..6ad9418 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 6c364e2..7b2fe21 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -26,6 +26,9 @@ Library - Issue #9354: Provide getsockopt() in asyncore's file_wrapper. +- Issue #7372: Fix pstats regression when stripping paths from profile + data generated with the profile module. + - Issue #4108: In urllib.robotparser, if there are multiple 'User-agent: *' entries, consider the first one. -- cgit v0.12