summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew M. Kuchling <amk@amk.ca>2006-10-27 13:29:41 +0000
committerAndrew M. Kuchling <amk@amk.ca>2006-10-27 13:29:41 +0000
commit5f958708685c3345290d625041b877c413723f76 (patch)
tree2e53b5e1e98972d99011360f4d8cbbe029e848e4
parent935add1d302e452ea4ae48484bbde16fe2af1412 (diff)
downloadcpython-git-5f958708685c3345290d625041b877c413723f76.tar.gz
[Bug #1542016] Report PCALL_POP value. This makes the return value of sys.callstats() match its docstring.
Backport candidate. Though it's an API change, this is a pretty obscure portion of the API.
-rw-r--r--Misc/NEWS3
-rw-r--r--Python/ceval.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index c79a55ab7e..a1033bf378 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -14,6 +14,9 @@ Core and builtins
- Patch #1549049: Support long values in structmember.
+- Bug #1542016: make sys.callstats() match its docstring and return an
+ 11-tuple (only relevant when Python is compiled with -DCALL_PROFILE).
+
- Bug #1545497: when given an explicit base, int() did ignore NULs
embedded in the string to convert.
diff --git a/Python/ceval.c b/Python/ceval.c
index 99e87e8100..73e8dee790 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -186,10 +186,10 @@ static int pcall[PCALL_NUM];
PyObject *
PyEval_GetCallStats(PyObject *self)
{
- return Py_BuildValue("iiiiiiiiii",
+ return Py_BuildValue("iiiiiiiiiii",
pcall[0], pcall[1], pcall[2], pcall[3],
pcall[4], pcall[5], pcall[6], pcall[7],
- pcall[8], pcall[9]);
+ pcall[8], pcall[9], pcall[10]);
}
#else
#define PCALL(O)