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).
........
This commit is contained in:
Victor Stinner 2010-03-25 00:55:12 +00:00
parent 120c21227a
commit 41ff399486
1 changed files with 3 additions and 3 deletions

View File

@ -2543,7 +2543,7 @@ PyCurses_tigetflag(PyObject *self, PyObject *args)
PyCursesSetupTermCalled; PyCursesSetupTermCalled;
if (!PyArg_ParseTuple(args, "z", &capname)) if (!PyArg_ParseTuple(args, "s", &capname))
return NULL; return NULL;
return PyLong_FromLong( (long) tigetflag( capname ) ); return PyLong_FromLong( (long) tigetflag( capname ) );
@ -2556,7 +2556,7 @@ PyCurses_tigetnum(PyObject *self, PyObject *args)
PyCursesSetupTermCalled; PyCursesSetupTermCalled;
if (!PyArg_ParseTuple(args, "z", &capname)) if (!PyArg_ParseTuple(args, "s", &capname))
return NULL; return NULL;
return PyLong_FromLong( (long) tigetnum( capname ) ); return PyLong_FromLong( (long) tigetnum( capname ) );
@ -2569,7 +2569,7 @@ PyCurses_tigetstr(PyObject *self, PyObject *args)
PyCursesSetupTermCalled; PyCursesSetupTermCalled;
if (!PyArg_ParseTuple(args, "z", &capname)) if (!PyArg_ParseTuple(args, "s", &capname))
return NULL; return NULL;
capname = tigetstr( capname ); capname = tigetstr( capname );