summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@haypocalc.com>2010-03-25 00:56:18 (GMT)
committerVictor Stinner <victor.stinner@haypocalc.com>2010-03-25 00:56:18 (GMT)
commitf149edadbda023502f88469ae4dc8c9dd62d505c (patch)
treedca01298359f24eb1fd4a4527847c9f528eda69c /Modules
parentd8805b2bb8f5e25641153776c6a01c5653417ec9 (diff)
downloadcpython-f149edadbda023502f88469ae4dc8c9dd62d505c.zip
cpython-f149edadbda023502f88469ae4dc8c9dd62d505c.tar.gz
cpython-f149edadbda023502f88469ae4dc8c9dd62d505c.tar.bz2
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). ........ ................
Diffstat (limited to 'Modules')
-rw-r--r--Modules/_cursesmodule.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c
index a89c22b..f8c268e 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 );