[Python-checkins] r83535 - in python/branches/release26-maint: Lib/pstats.py Lib/test/test_pstats.py Misc/NEWS
georg.brandl
python-checkins at python.org
Mon Aug 2 19:40:28 CEST 2010
Author: georg.brandl
Date: Mon Aug 2 19:40:28 2010
New Revision: 83535
Log:
Merged revisions 83533 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/release27-maint
................
r83533 | georg.brandl | 2010-08-02 19:34:58 +0200 (Mo, 02 Aug 2010) | 9 lines
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.
........
................
Modified:
python/branches/release26-maint/ (props changed)
python/branches/release26-maint/Lib/pstats.py
python/branches/release26-maint/Lib/test/test_pstats.py
python/branches/release26-maint/Misc/NEWS
Modified: python/branches/release26-maint/Lib/pstats.py
==============================================================================
--- python/branches/release26-maint/Lib/pstats.py (original)
+++ python/branches/release26-maint/Lib/pstats.py Mon Aug 2 19:40:28 2010
@@ -522,8 +522,13 @@
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
Modified: python/branches/release26-maint/Lib/test/test_pstats.py
==============================================================================
--- python/branches/release26-maint/Lib/test/test_pstats.py (original)
+++ python/branches/release26-maint/Lib/test/test_pstats.py Mon Aug 2 19:40:28 2010
@@ -10,10 +10,16 @@
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():
Modified: python/branches/release26-maint/Misc/NEWS
==============================================================================
--- python/branches/release26-maint/Misc/NEWS (original)
+++ python/branches/release26-maint/Misc/NEWS Mon Aug 2 19:40:28 2010
@@ -35,6 +35,9 @@
when turned into an exception: in this case the exception simply
gets ignored.
+- 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.
More information about the Python-checkins
mailing list