From f149edadbda023502f88469ae4dc8c9dd62d505c Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Thu, 25 Mar 2010 00:56:18 +0000 Subject: [PATCH] Merged revisions 79398 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r79398 | victor.stinner | 2010-03-25 01:55:12 +0100 (jeu., 25 mars 2010) | 12 lines Merged revisions 79395 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r79395 | victor.stinner | 2010-03-25 01:51:58 +0100 (jeu., 25 mars 2010) | 5 lines Fix _curses.tiget*() functions: deny None to avoid a crash. Fix the following calls: _curses.tigetflag(None), _curses.tigetnum(None), _curses.tigetstr(None). ........ ................ --- Modules/_cursesmodule.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c index a89c22bafa7..f8c268ecfa5 100644 --- a/Modules/_cursesmodule.c +++ b/Modules/_cursesmodule.c @@ -2545,7 +2545,7 @@ PyCurses_tigetflag(PyObject *self, PyObject *args) PyCursesSetupTermCalled; - if (!PyArg_ParseTuple(args, "z", &capname)) + if (!PyArg_ParseTuple(args, "s", &capname)) return NULL; return PyLong_FromLong( (long) tigetflag( capname ) ); @@ -2558,7 +2558,7 @@ PyCurses_tigetnum(PyObject *self, PyObject *args) PyCursesSetupTermCalled; - if (!PyArg_ParseTuple(args, "z", &capname)) + if (!PyArg_ParseTuple(args, "s", &capname)) return NULL; return PyLong_FromLong( (long) tigetnum( capname ) ); @@ -2571,7 +2571,7 @@ PyCurses_tigetstr(PyObject *self, PyObject *args) PyCursesSetupTermCalled; - if (!PyArg_ParseTuple(args, "z", &capname)) + if (!PyArg_ParseTuple(args, "s", &capname)) return NULL; capname = tigetstr( capname );