diff Objects/funcobject.c @ 39455:ed65765eb679 legacy-trunk

Whoops, how did that get in there. :-) Revert all the parts of 51227 that were not supposed to go it. Only Modules/_ctypes/cfields.c was supposed to be changed
author Neal Norwitz <nnorwitz@gmail.com>
date Sat, 12 Aug 2006 02:12:30 +0000
parents 9a1288d8200f
children 5e43c7367d54
line wrap: on
line diff
--- a/Objects/funcobject.c	Sat Aug 12 02:06:34 2006 +0000
+++ b/Objects/funcobject.c	Sat Aug 12 02:12:30 2006 +0000
@@ -486,10 +486,9 @@
 	Py_ssize_t nk, nd;
 
 	argdefs = PyFunction_GET_DEFAULTS(func);
-	/* XXX(nnorwitz): don't we know argdefs is either NULL or a tuple? */
 	if (argdefs != NULL && PyTuple_Check(argdefs)) {
 		d = &PyTuple_GET_ITEM((PyTupleObject *)argdefs, 0);
-		nd = PyTuple_GET_SIZE(argdefs);
+		nd = PyTuple_Size(argdefs);
 	}
 	else {
 		d = NULL;
@@ -518,7 +517,7 @@
 	result = PyEval_EvalCodeEx(
 		(PyCodeObject *)PyFunction_GET_CODE(func),
 		PyFunction_GET_GLOBALS(func), (PyObject *)NULL,
-		&PyTuple_GET_ITEM(arg, 0), PyTuple_GET_SIZE(arg),
+		&PyTuple_GET_ITEM(arg, 0), PyTuple_Size(arg),
 		k, nk, d, nd,
 		PyFunction_GET_CLOSURE(func));