[Python-checkins] r52470 - in python/branches/release25-maint: Misc/NEWS Python/ceval.c

[andrew.kuchling]

Author: andrew.kuchling
Date: Fri Oct 27 15:29:41 2006
New Revision: 52470

Modified:
   python/branches/release25-maint/Misc/NEWS
   python/branches/release25-maint/Python/ceval.c
Log:
[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.

Modified: python/branches/release25-maint/Misc/NEWS
==============================================================================
--- python/branches/release25-maint/Misc/NEWS	(original)
+++ python/branches/release25-maint/Misc/NEWS	Fri Oct 27 15:29:41 2006
@@ -14,6 +14,9 @@
 
 - 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.
 

Modified: python/branches/release25-maint/Python/ceval.c
==============================================================================
--- python/branches/release25-maint/Python/ceval.c	(original)
+++ python/branches/release25-maint/Python/ceval.c	Fri Oct 27 15:29:41 2006
@@ -186,10 +186,10 @@
 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)