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).
........

diff --git a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c
index 3564a57fc151afe88a1bdf151a2bf79cd04561f4..40b9844252e9e47c39e7ec415d27729b1ce95234 100644 (file)
--- a/Modules/_cursesmodule.c
+++ b/Modules/_cursesmodule.c
@@ -2543,7 +2543,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 ) );
@@ -2556,7 +2556,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 ) );
@@ -2569,7 +2569,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 );