[Bug #1542016] Report PCALL_POP value. This makes the return value of sys.callstats...

diff --git a/Misc/NEWS b/Misc/NEWS
index e0c0a3cfbeb5b172c83cf3a3356f9a3ebf686aa7..ccb37a76969ca911fa7ca906cb7f1fb07111c065 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -13,6 +13,9 @@ What's New in Python 2.4.5c1?
 Core and builtins
 -----------------
 
+- Bug #1542016: make sys.callstats() match its docstring and return an
+  11-tuple (only relevant when Python is compiled with -DCALL_PROFILE).
+
 Extension Modules
 -----------------
 

diff --git a/Python/ceval.c b/Python/ceval.c
index 04dda2552c386f4539c99bf412270adaea29763f..b9000a652c46cd81148a5f00861e49fd5cea7acc 100644 (file)
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -179,10 +179,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)