[Python-checkins] python/dist/src/Mac/Modules Nav.c,1.16,1.17 calldll.c,1.7,1.8 ctbmodule.c,1.12,1.13 icgluemodule.c,1.8,1.9 macfsmodule.c,1.54,1.55 macosmodule.c,1.59,1.60 macspeechmodule.c,1.13,1.14

2002年5月22日 07:31:50 -0700

Update of /cvsroot/python/python/dist/src/Mac/Modules
In directory usw-pr-cvs1:/tmp/cvs-serv4167
Modified Files:
	Nav.c calldll.c ctbmodule.c icgluemodule.c macfsmodule.c 
	macosmodule.c macspeechmodule.c 
Log Message:
Replaced lots of PyMem_DEL() calls with PyObject_DEL().
Index: Nav.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/Nav.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** Nav.c	8 Dec 2001 18:02:51 -0000	1.16
--- Nav.c	22 May 2002 14:31:47 -0000	1.17
***************
*** 310,314 ****
 {
 	NavDisposeReply(&self->itself);
! 	PyMem_DEL(self);
 }
 
--- 310,314 ----
 {
 	NavDisposeReply(&self->itself);
! 	PyObject_DEL(self);
 }
 
Index: calldll.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/calldll.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** calldll.c	8 Dec 2001 18:02:51 -0000	1.7
--- calldll.c	22 May 2002 14:31:47 -0000	1.8
***************
*** 544,548 ****
 	cdrobject *self;
 {
! 	PyMem_DEL(self);
 }
 
--- 544,548 ----
 	cdrobject *self;
 {
! 	PyObject_DEL(self);
 }
 
***************
*** 632,636 ****
 {
 	Py_XDECREF(self->routine);
! 	PyMem_DEL(self);
 }
 
--- 632,636 ----
 {
 	Py_XDECREF(self->routine);
! 	PyObject_DEL(self);
 }
 
***************
*** 856,860 ****
 	cdfobject *self;
 {
! 	PyMem_DEL(self);
 }
 
--- 856,860 ----
 	cdfobject *self;
 {
! 	PyObject_DEL(self);
 }
 
Index: ctbmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/ctbmodule.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** ctbmodule.c	8 Dec 2001 18:02:51 -0000	1.12
--- ctbmodule.c	22 May 2002 14:31:47 -0000	1.13
***************
*** 187,191 ****
 		self->hdl = NULL;
 	}
! 	PyMem_DEL(self);
 }
 
--- 187,191 ----
 		self->hdl = NULL;
 	}
! 	PyObject_DEL(self);
 }
 
Index: icgluemodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/icgluemodule.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** icgluemodule.c	11 Jan 2002 12:38:08 -0000	1.8
--- icgluemodule.c	22 May 2002 14:31:47 -0000	1.9
***************
*** 461,465 ****
 	if ((err=ICStart(&self->inst, creator)) != 0 ) {
 		(void)PyMac_Error(err);
! 		PyMem_DEL(self);
 		return NULL;
 	}
--- 461,465 ----
 	if ((err=ICStart(&self->inst, creator)) != 0 ) {
 		(void)PyMac_Error(err);
! 		PyObject_DEL(self);
 		return NULL;
 	}
***************
*** 472,476 ****
 {
 	(void)ICStop(self->inst);
! 	PyMem_DEL(self);
 }
 
--- 472,476 ----
 {
 	(void)ICStop(self->inst);
! 	PyObject_DEL(self);
 }
 
Index: macfsmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/macfsmodule.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** macfsmodule.c	26 Feb 2002 21:36:19 -0000	1.54
--- macfsmodule.c	22 May 2002 14:31:48 -0000	1.55
***************
*** 228,232 ****
 #endif
 		
! 	PyMem_DEL(self);
 }
 
--- 228,232 ----
 #endif
 		
! 	PyObject_DEL(self);
 }
 
***************
*** 277,281 ****
 mfsi_dealloc(mfsiobject *self)
 {
! 	PyMem_DEL(self);
 }
 
--- 277,281 ----
 mfsi_dealloc(mfsiobject *self)
 {
! 	PyObject_DEL(self);
 }
 
***************
*** 701,705 ****
 mfss_dealloc(mfssobject *self)
 {
! 	PyMem_DEL(self);
 }
 
--- 701,705 ----
 mfss_dealloc(mfssobject *self)
 {
! 	PyObject_DEL(self);
 }
 
***************
*** 847,851 ****
 mfsr_dealloc(mfsrobject *self)
 {
! 	PyMem_DEL(self);
 }
 
--- 847,851 ----
 mfsr_dealloc(mfsrobject *self)
 {
! 	PyObject_DEL(self);
 }
 
Index: macosmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/macosmodule.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -d -r1.59 -r1.60
*** macosmodule.c	11 Apr 2002 20:56:13 -0000	1.59
--- macosmodule.c	22 May 2002 14:31:48 -0000	1.60
***************
*** 260,264 ****
 {
 	do_close(self);
! 	PyMem_DEL(self);
 }
 
--- 260,264 ----
 {
 	do_close(self);
! 	PyObject_DEL(self);
 }
 
Index: macspeechmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/macspeechmodule.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** macspeechmodule.c	8 Dec 2001 18:02:51 -0000	1.13
--- macspeechmodule.c	22 May 2002 14:31:48 -0000	1.14
***************
*** 118,122 ****
 {
 	DisposeSpeechChannel(self->chan);
! 	PyMem_DEL(self);
 }
 
--- 118,122 ----
 {
 	DisposeSpeechChannel(self->chan);
! 	PyObject_DEL(self);
 }
 
***************
*** 325,329 ****
 	mvobject *self;
 {
! 	PyMem_DEL(self);
 }
 
--- 325,329 ----
 	mvobject *self;
 {
! 	PyObject_DEL(self);
 }