mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merged revisions 83531 via svnmerge from

Browse source 
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.
........
This commit is contained in:
Georg Brandl 2010-08-02 17:36:05 +00:00
parent bdeff47680
commit e90bce7df7
3 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Lib/pstats.py
View file

@ -521,8 +521,13 @@ def add_callers(target, source):
new_callers[func] = caller new_callers[func] = caller
for func, caller in source.items(): for func, caller in source.items():
if func in new_callers: if func in new_callers:
new_callers[func] = tuple([i[0] + i[1] for i in if isinstance(caller, tuple):
zip(caller, new_callers[func])]) # 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: else:
new_callers[func] = caller new_callers[func] = caller
return new_callers return new_callers

6
Lib/test/test_pstats.py
View file

@ -10,10 +10,16 @@ class AddCallersTestCase(unittest.TestCase):
def test_combine_results(self): def test_combine_results(self):
"""pstats.add_callers should combine the call results of both target """pstats.add_callers should combine the call results of both target
and source by adding the call time. See issue1269.""" and source by adding the call time. See issue1269."""
# new format: used by the cProfile module
target = {"a": (1, 2, 3, 4)} target = {"a": (1, 2, 3, 4)}
source = {"a": (1, 2, 3, 4), "b": (5, 6, 7, 8)} source = {"a": (1, 2, 3, 4), "b": (5, 6, 7, 8)}
new_callers = pstats.add_callers(target, source) new_callers = pstats.add_callers(target, source)
self.assertEqual(new_callers, {'a': (2, 4, 6, 8), 'b': (5, 6, 7, 8)}) 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(): def test_main():

3
Misc/NEWS
View file

@ -84,6 +84,9 @@ C-API
Library Library
------- -------
- 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: *' - Issue #4108: In urllib.robotparser, if there are multiple 'User-agent: *'
entries, consider the first one. entries, consider the first one.