]> granicus.if.org Git - python/commit
Merged revisions 83531 via svnmerge from
authorGeorg Brandl <georg@python.org>
Mon, 2 Aug 2010 17:36:05 +0000 (17:36 +0000)
committerGeorg Brandl <georg@python.org>
Mon, 2 Aug 2010 17:36:05 +0000 (17:36 +0000)
commite90bce7df7c5457af13fc97dc3178775cd292c70
treea3ddb25c94817c5ffc66f4f5d32a1b85a2d0b23f
parentbdeff47680e827b5c534af94a0cc0744689b863c
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