[Python-checkins] r60149 - in python/trunk: Lib/pstats.py Lib/test/test_pstats.py Misc/NEWS

[georg.brandl]

Author: georg.brandl
Date: Mon Jan 21 11:24:59 2008
New Revision: 60149

Added:
   python/trunk/Lib/test/test_pstats.py
Modified:
   python/trunk/Lib/pstats.py
   python/trunk/Misc/NEWS
Log:
#1269: fix a bug in pstats.add_callers() and add a unit test file for pstats.


Modified: python/trunk/Lib/pstats.py
==============================================================================
--- python/trunk/Lib/pstats.py	(original)
+++ python/trunk/Lib/pstats.py	Mon Jan 21 11:24:59 2008
@@ -512,7 +512,8 @@
         new_callers[func] = caller
     for func, caller in source.iteritems():
         if func in new_callers:
-            new_callers[func] = caller + new_callers[func]
+            new_callers[func] = tuple([i[0] + i[1] for i in
+                                       zip(caller, new_callers[func])])
         else:
             new_callers[func] = caller
     return new_callers

Added: python/trunk/Lib/test/test_pstats.py
==============================================================================
--- (empty file)
+++ python/trunk/Lib/test/test_pstats.py	Mon Jan 21 11:24:59 2008
@@ -0,0 +1,26 @@
+import unittest
+from test import test_support
+import pstats
+
+
+
+class AddCallersTestCase(unittest.TestCase):
+    """Tests for pstats.add_callers helper."""
+
+    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."""
+        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)})
+
+
+def test_main():
+    test_support.run_unittest(
+        AddCallersTestCase
+    )
+
+
+if __name__ == "__main__":
+    test_main()

Modified: python/trunk/Misc/NEWS
==============================================================================
--- python/trunk/Misc/NEWS	(original)
+++ python/trunk/Misc/NEWS	Mon Jan 21 11:24:59 2008
@@ -369,6 +369,9 @@
 Library
 -------
 
+- #1269: fix a bug in pstats.add_callers() and add a unit test file for
+  pstats.
+
 - #1669: don't allow shutil.rmtree() to be called on a symlink to a
   directory.