diff options
| author | Neal Norwitz <nnorwitz@gmail.com> | 2006-08-12 02:12:30 (GMT) |
|---|---|---|
| committer | Neal Norwitz <nnorwitz@gmail.com> | 2006-08-12 02:12:30 (GMT) |
| commit | 421c1319adec1bc0f2c822f1055f79a2f0cf3b58 (patch) | |
| tree | ce4a92245a71e5d1e180a5d349f7a8296905189a /Objects | |
| parent | 6b4953fd3d3d1df06f692af67f593d3d0a7aef26 (diff) | |
| download | cpython-421c1319adec1bc0f2c822f1055f79a2f0cf3b58.zip cpython-421c1319adec1bc0f2c822f1055f79a2f0cf3b58.tar.gz cpython-421c1319adec1bc0f2c822f1055f79a2f0cf3b58.tar.bz2 | |
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
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/funcobject.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Objects/funcobject.c b/Objects/funcobject.c index b972e08..1ba74c5 100644 --- a/Objects/funcobject.c +++ b/Objects/funcobject.c @@ -486,10 +486,9 @@ function_call(PyObject *func, PyObject *arg, PyObject *kw) 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 @@ function_call(PyObject *func, PyObject *arg, PyObject *kw) 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)); |