[Python-checkins] python/dist/src/Modules _csv.c,1.8,1.9

montanaro@users.sourceforge.net montanaro@users.sourceforge.net
Sat, 12 Apr 2003 12:23:48 -0700


Update of /cvsroot/python/python/dist/src/Modules
In directory sc8-pr-cvs1:/tmp/cvs-serv18705

Modified Files:
	_csv.c 
Log Message:
use PyModule_Add{Int,String}Constant() where appropriate
(thanks to Neal Norwitz for the code review, BTW)


Index: _csv.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/_csv.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** _csv.c	12 Apr 2003 19:17:14 -0000	1.8
--- _csv.c	12 Apr 2003 19:23:46 -0000	1.9
***************
*** 13,16 ****
--- 13,18 ----
  */
  
+ #define MODULE_VERSION "1.0"
+ 
  #include "Python.h"
  #include "structmember.h"
***************
*** 1441,1447 ****
  {
  	PyObject *module;
- 	PyObject *rev;
- 	PyObject *v;
- 	int res;
  	StyleDesc *style;
  
--- 1443,1446 ----
***************
*** 1461,1468 ****
  
  	/* Add version to the module. */
! 	rev = PyString_FromString("1.0");
! 	if (rev == NULL)
! 		return;
!         if (PyModule_AddObject(module, "__version__", rev) < 0)
  		return;
  
--- 1460,1465 ----
  
  	/* Add version to the module. */
! 	if (PyModule_AddStringConstant(module, "__version__",
! 				       MODULE_VERSION) == -1)
  		return;
  
***************
*** 1476,1484 ****
  	/* Add quote styles into dictionary */
  	for (style = quote_styles; style->name; style++) {
! 		v = PyInt_FromLong(style->style);
! 		if (v == NULL)
! 			return;
! 		res = PyModule_AddObject(module, style->name, v);
! 		if (res < 0)
  			return;
  	}
--- 1473,1478 ----
  	/* Add quote styles into dictionary */
  	for (style = quote_styles; style->name; style++) {
! 		if (PyModule_AddIntConstant(module, style->name,
! 					    style->style) == -1)
  			return;
  	}