[Python-checkins] r79396 - in python/branches/release26-maint: Modules/_cursesmodule.c

[victor.stinner]

Author: victor.stinner
Date: Thu Mar 25 01:53:11 2010
New Revision: 79396

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/release26-maint/   (props changed)
   python/branches/release26-maint/Modules/_cursesmodule.c

Modified: python/branches/release26-maint/Modules/_cursesmodule.c
==============================================================================
--- python/branches/release26-maint/Modules/_cursesmodule.c	(original)
+++ python/branches/release26-maint/Modules/_cursesmodule.c	Thu Mar 25 01:53:11 2010
@@ -2467,7 +2467,7 @@
 
 	PyCursesSetupTermCalled;
 		
-	if (!PyArg_ParseTuple(args, "z", &capname))
+	if (!PyArg_ParseTuple(args, "s", &capname))
 		return NULL;
 
 	return PyInt_FromLong( (long) tigetflag( capname ) );
@@ -2480,7 +2480,7 @@
 
 	PyCursesSetupTermCalled;
 		
-	if (!PyArg_ParseTuple(args, "z", &capname))
+	if (!PyArg_ParseTuple(args, "s", &capname))
 		return NULL;
 
 	return PyInt_FromLong( (long) tigetnum( capname ) );
@@ -2493,7 +2493,7 @@
 
 	PyCursesSetupTermCalled;
 		
-	if (!PyArg_ParseTuple(args, "z", &capname))
+	if (!PyArg_ParseTuple(args, "s", &capname))
 		return NULL;
 
 	capname = tigetstr( capname );