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

diff --git a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c
index a89c22bafa70b0a5d0862e2cb8d28d8b2d7bb3ef..f8c268ecfa53053565827969a2585756c71c2a15 100644 (file)
--- 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 );