diff options
| author | Christian Heimes <christian@cheimes.de> | 2008-01-21 11:20:28 +0000 |
|---|---|---|
| committer | Christian Heimes <christian@cheimes.de> | 2008-01-21 11:20:28 +0000 |
| commit | e94ec21e29ba89735d7c93d3b8fe8b64088b6029 (patch) | |
| tree | ef1821b8f38ed2eca781f917ec41b0d244dbf928 /Lib/pstats.py | |
| parent | 852b51a5cc7f78933273014b19ff93c444e7db5f (diff) | |
| download | cpython-e94ec21e29ba89735d7c93d3b8fe8b64088b6029.tar.gz | |
Merged revisions 60143-60149 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r60143 | georg.brandl | 2008-01-20 15:50:05 +0100 (Sun, 20 Jan 2008) | 3 lines
Switch mmap from old Py_FindMethod to new PyObject_GenericGetAttr attribute access.
Fixes #1087735.
........
r60145 | georg.brandl | 2008-01-20 20:40:58 +0100 (Sun, 20 Jan 2008) | 2 lines
Add blurb about executable scripts on Windows. #760657.
........
r60146 | georg.brandl | 2008-01-20 20:48:40 +0100 (Sun, 20 Jan 2008) | 2 lines
#1219903: fix tp_richcompare docs.
........
r60147 | georg.brandl | 2008-01-20 22:10:08 +0100 (Sun, 20 Jan 2008) | 2 lines
Fix markup.
........
r60148 | gregory.p.smith | 2008-01-21 08:11:11 +0100 (Mon, 21 Jan 2008) | 14 lines
Provide a sanity check during PyThreadState_DeleteCurrent() and
PyThreadState_Delete() to avoid an infinite loop when the tstate list
is messed up and has somehow becomes circular and does not contain the
current thread.
I don't know how this happens but it does, *very* rarely. On more than
one hardware platform. I have not been able to reproduce it manually.
Attaching to a process where its happening: it has always been in an
infinite loop over a single element tstate list that is not the tstate
we're looking to delete. It has been in t_bootstrap()'s call to
PyThreadState_DeleteCurrent() as a pthread is exiting.
........
r60149 | georg.brandl | 2008-01-21 11:24:59 +0100 (Mon, 21 Jan 2008) | 2 lines
#1269: fix a bug in pstats.add_callers() and add a unit test file for pstats.
........
Diffstat (limited to 'Lib/pstats.py')
| -rw-r--r-- | Lib/pstats.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Lib/pstats.py b/Lib/pstats.py index 5a2f2d07b3..39f1b64584 100644 --- a/Lib/pstats.py +++ b/Lib/pstats.py @@ -511,7 +511,8 @@ def add_callers(target, source): new_callers[func] = caller for func, caller in source.items(): 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 |