]> granicus.if.org Git - python/commit
Merged revisions 83531 via svnmerge from
authorGeorg Brandl <georg@python.org>
Mon, 2 Aug 2010 17:34:58 +0000 (17:34 +0000)
committerGeorg Brandl <georg@python.org>
Mon, 2 Aug 2010 17:34:58 +0000 (17:34 +0000)
commita2a92cf2c0aa6ace3202c3c61b8768a5e84f5335
treed51e9f1cf7c5d8652073e1f4f2d820b0eaafc128
parent58f55d5d42f7095cbc4bf599a19252b5a4099c02
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
Lib/test/test_pstats.py
Misc/NEWS