From 0c766a0bb62877a1080acf3c70ca6ed393d9e7fc Mon Sep 17 00:00:00 2001 From: Neal Norwitz Date: Wed, 27 Mar 2002 13:03:09 +0000 Subject: Change sys_exit to use METH_VARARGS. sys.exit() now requires 0-1 arguments. Previously 2+ arguments were allowed. --- Python/sysmodule.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'Python/sysmodule.c') diff --git a/Python/sysmodule.c b/Python/sysmodule.c index 581a19baae..0469c7f654 100644 --- a/Python/sysmodule.c +++ b/Python/sysmodule.c @@ -146,8 +146,11 @@ This should be called from inside an except clause only."; static PyObject * sys_exit(PyObject *self, PyObject *args) { + PyObject *exit_code = 0; + if (!PyArg_ParseTuple(args, "|O:exit", &exit_code)) + return NULL; /* Raise SystemExit so callers may catch it or clean up. */ - PyErr_SetObject(PyExc_SystemExit, args); + PyErr_SetObject(PyExc_SystemExit, exit_code); return NULL; } @@ -528,7 +531,7 @@ static PyMethodDef sys_methods[] = { {"displayhook", sys_displayhook, METH_O, displayhook_doc}, {"exc_info", (PyCFunction)sys_exc_info, METH_NOARGS, exc_info_doc}, {"excepthook", sys_excepthook, METH_VARARGS, excepthook_doc}, - {"exit", sys_exit, METH_OLDARGS, exit_doc}, + {"exit", sys_exit, METH_VARARGS, exit_doc}, #ifdef Py_USING_UNICODE {"getdefaultencoding", (PyCFunction)sys_getdefaultencoding, METH_NOARGS, getdefaultencoding_doc}, -- cgit v1.2.1