mirror of https://github.com/python/cpython
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). ........ ................
This commit is contained in:
parent
d8805b2bb8
commit
f149edadbd
|
@ -2545,7 +2545,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 ) );
|
||||||
|
@ -2558,7 +2558,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 ) );
|
||||||
|
@ -2571,7 +2571,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 );
|
||||||
|
|
Loading…
Reference in New Issue