[Python-checkins] r79398 - in python/branches/py3k: Modules/_cursesmodule.c

Thu Mar 25 01:55:12 CET 2010

Author: victor.stinner
Date: Thu Mar 25 01:55:12 2010
New Revision: 79398
Log:
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).
........
Modified:
 python/branches/py3k/ (props changed)
 python/branches/py3k/Modules/_cursesmodule.c
Modified: python/branches/py3k/Modules/_cursesmodule.c
==============================================================================

--- python/branches/py3k/Modules/_cursesmodule.c	(original)
+++ python/branches/py3k/Modules/_cursesmodule.c	Thu Mar 25 01:55:12 2010
@@ -2543,7 +2543,7 @@
 
 	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 @@
 
 	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 @@
 
 	PyCursesSetupTermCalled;
 		
-	if (!PyArg_ParseTuple(args, "z", &capname))
+	if (!PyArg_ParseTuple(args, "s", &capname))
 		return NULL;
 
 	capname = tigetstr( capname );
