[Python-checkins] python/dist/src/Mac/Modules/ibcarbon IBCarbonsupport.py,1.3,1.4 _IBCarbon.c,1.4,1.5

[jackjansen@users.sourceforge.net]

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

Modified Files:
	IBCarbonsupport.py _IBCarbon.c 
Log Message:
Added PEP253 support to most Carbon modules. This isn't complete yet:
some of the more compilcated cases (CF, Res) haven't been done yet. Also,
various types should inherit from each other (anything with an as_Resource
method should be a Resource subtype, the CF types should become one family).


Index: IBCarbonsupport.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/ibcarbon/IBCarbonsupport.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** IBCarbonsupport.py	29 Nov 2002 23:40:43 -0000	1.3
--- IBCarbonsupport.py	3 Dec 2002 23:40:20 -0000	1.4
***************
*** 32,40 ****
  module = MacModule('_IBCarbon', 'IBCarbon', includestuff, finalstuff, initstuff)
  
! class CFReleaserObject(PEP252Mixin, GlobalObjectDefinition):
  	def outputFreeIt(self, name):
  		Output("CFRelease(%s);" % name)
  
! class CFNibDesc(PEP252Mixin, GlobalObjectDefinition):
  	def outputFreeIt(self, name):
  		Output("DisposeNibReference(%s);" % name)
--- 32,40 ----
  module = MacModule('_IBCarbon', 'IBCarbon', includestuff, finalstuff, initstuff)
  
! class CFReleaserObject(PEP253Mixin, GlobalObjectDefinition):
  	def outputFreeIt(self, name):
  		Output("CFRelease(%s);" % name)
  
! class CFNibDesc(PEP253Mixin, GlobalObjectDefinition):
  	def outputFreeIt(self, name):
  		Output("DisposeNibReference(%s);" % name)

Index: _IBCarbon.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/ibcarbon/_IBCarbon.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** _IBCarbon.c	29 Nov 2002 23:40:43 -0000	1.4
--- _IBCarbon.c	3 Dec 2002 23:40:20 -0000	1.5
***************
*** 143,146 ****
--- 143,147 ----
  #define IBNibRefObj_getsetlist NULL
  
+ 
  #define IBNibRefObj_compare NULL
  
***************
*** 148,151 ****
--- 149,170 ----
  
  #define IBNibRefObj_hash NULL
+ #define IBNibRefObj_tp_init 0
+ 
+ #define IBNibRefObj_tp_alloc PyType_GenericAlloc
+ 
+ static PyObject *IBNibRefObj_tp_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
+ {
+ 	PyObject *self;
+ 	IBNibRef itself;
+ 	char *kw[] = {"itself", 0};
+ 
+ 	if (!PyArg_ParseTupleAndKeywords(args, kwds, "O&", kw, IBNibRefObj_Convert, &itself)) return NULL;
+ 	if ((self = type->tp_alloc(type, 0)) == NULL) return NULL;
+ 	((IBNibRefObject *)self)->ob_itself = itself;
+ 	return self;
+ }
+ 
+ #define IBNibRefObj_tp_free PyObject_Del
+ 
  
  PyTypeObject IBNibRef_Type = {
***************
*** 170,186 ****
  	PyObject_GenericGetAttr, /*tp_getattro*/
  	PyObject_GenericSetAttr, /*tp_setattro */
! 	0, /*outputHook_tp_as_buffer*/
! 	0, /*outputHook_tp_flags*/
! 	0, /*outputHook_tp_doc*/
! 	0, /*outputHook_tp_traverse*/
! 	0, /*outputHook_tp_clear*/
! 	0, /*outputHook_tp_richcompare*/
! 	0, /*outputHook_tp_weaklistoffset*/
! 	0, /*outputHook_tp_iter*/
! 	0, /*outputHook_tp_iternext*/
  	IBNibRefObj_methods, /* tp_methods */
! 	0, /*outputHook_tp_members*/
  	IBNibRefObj_getsetlist, /*tp_getset*/
! 	0, /*outputHook_tp_base*/
  };
  
--- 189,213 ----
  	PyObject_GenericGetAttr, /*tp_getattro*/
  	PyObject_GenericSetAttr, /*tp_setattro */
! 	0, /*tp_as_buffer*/
! 	Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE, /* tp_flags */
! 	0, /*tp_doc*/
! 	0, /*tp_traverse*/
! 	0, /*tp_clear*/
! 	0, /*tp_richcompare*/
! 	0, /*tp_weaklistoffset*/
! 	0, /*tp_iter*/
! 	0, /*tp_iternext*/
  	IBNibRefObj_methods, /* tp_methods */
! 	0, /*tp_members*/
  	IBNibRefObj_getsetlist, /*tp_getset*/
! 	0, /*tp_base*/
! 	0, /*tp_dict*/
! 	0, /*tp_descr_get*/
! 	0, /*tp_descr_set*/
! 	0, /*tp_dictoffset*/
! 	IBNibRefObj_tp_init, /* tp_init */
! 	IBNibRefObj_tp_alloc, /* tp_alloc */
! 	IBNibRefObj_tp_new, /* tp_new */
! 	IBNibRefObj_tp_free, /* tp_free */
  };
  
***************
*** 231,236 ****
  	IBNibRef_Type.ob_type = &PyType_Type;
  	Py_INCREF(&IBNibRef_Type);
! 	if (PyDict_SetItemString(d, "IBNibRefType", (PyObject *)&IBNibRef_Type) != 0)
! 		Py_FatalError("can't initialize IBNibRefType");
  }
  
--- 258,265 ----
  	IBNibRef_Type.ob_type = &PyType_Type;
  	Py_INCREF(&IBNibRef_Type);
! 	PyModule_AddObject(m, "IBNibRef", (PyObject *)&IBNibRef_Type);
! 	/* Backward-compatible name */
! 	Py_INCREF(&IBNibRef_Type);
! 	PyModule_AddObject(m, "IBNibRefType", (PyObject *)&IBNibRef_Type);
  }