Convert getrefcount() to METH_O, and sys_excepthook() to use

PyArg_UnpackTuple().

diff --git a/Python/sysmodule.c b/Python/sysmodule.c
index deead3a93495ffcfb4f26677a725ac5ceb1f5256..711cd49baab4dfb1f6a04914c4c0f9c7f8a407a9 100644 (file)
--- a/Python/sysmodule.c
+++ b/Python/sysmodule.c
@@ -116,7 +116,7 @@ static PyObject *
 sys_excepthook(PyObject* self, PyObject* args)
 {
        PyObject *exc, *value, *tb;
-       if (!PyArg_ParseTuple(args, "OOO:excepthook", &exc, &value, &tb))
+       if (!PyArg_UnpackTuple(args, "excepthook", 3, 3, &exc, &value, &tb))
                return NULL;
        PyErr_Display(exc, value, tb);
        Py_INCREF(Py_None);
@@ -452,11 +452,8 @@ sys_mdebug(PyObject *self, PyObject *args)
 #endif /* USE_MALLOPT */
 
 static PyObject *
-sys_getrefcount(PyObject *self, PyObject *args)
+sys_getrefcount(PyObject *self, PyObject *arg)
 {
-       PyObject *arg;
-       if (!PyArg_ParseTuple(args, "O:getrefcount", &arg))
-               return NULL;
        return PyInt_FromLong(arg->ob_refcnt);
 }
 
@@ -554,7 +551,7 @@ static PyMethodDef sys_methods[] = {
        {"getobjects",  _Py_GetObjects, METH_VARARGS},
        {"gettotalrefcount", (PyCFunction)sys_gettotalrefcount, METH_NOARGS},
 #endif
-       {"getrefcount", sys_getrefcount, METH_VARARGS, getrefcount_doc},
+       {"getrefcount", (PyCFunction)sys_getrefcount, METH_O, getrefcount_doc},
        {"getrecursionlimit", (PyCFunction)sys_getrecursionlimit, METH_NOARGS,
         getrecursionlimit_doc},
        {"_getframe", sys_getframe, METH_VARARGS, getframe_doc},