[Python-checkins] python/dist/src/Mac/Modules/drag _Dragmodule.c,1.11,1.12 dragsupport.py,1.11,1.12

jackjansen@users.sourceforge.net jackjansen@users.sourceforge.net
Tue, 03 Dec 2002 15:40:52 -0800


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

Modified Files:
	_Dragmodule.c dragsupport.py 
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: _Dragmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/drag/_Dragmodule.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** _Dragmodule.c	29 Nov 2002 23:40:43 -0000	1.11
--- _Dragmodule.c	3 Dec 2002 23:40:20 -0000	1.12
***************
*** 743,746 ****
--- 743,747 ----
  #define DragObj_getsetlist NULL
  
+ 
  #define DragObj_compare NULL
  
***************
*** 748,751 ****
--- 749,770 ----
  
  #define DragObj_hash NULL
+ #define DragObj_tp_init 0
+ 
+ #define DragObj_tp_alloc PyType_GenericAlloc
+ 
+ static PyObject *DragObj_tp_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
+ {
+ 	PyObject *self;
+ 	DragRef itself;
+ 	char *kw[] = {"itself", 0};
+ 
+ 	if (!PyArg_ParseTupleAndKeywords(args, kwds, "O&", kw, DragObj_Convert, &itself)) return NULL;
+ 	if ((self = type->tp_alloc(type, 0)) == NULL) return NULL;
+ 	((DragObjObject *)self)->ob_itself = itself;
+ 	return self;
+ }
+ 
+ #define DragObj_tp_free PyObject_Del
+ 
  
  PyTypeObject DragObj_Type = {
***************
*** 770,786 ****
  	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*/
  	DragObj_methods, /* tp_methods */
! 	0, /*outputHook_tp_members*/
  	DragObj_getsetlist, /*tp_getset*/
! 	0, /*outputHook_tp_base*/
  };
  
--- 789,813 ----
  	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*/
  	DragObj_methods, /* tp_methods */
! 	0, /*tp_members*/
  	DragObj_getsetlist, /*tp_getset*/
! 	0, /*tp_base*/
! 	0, /*tp_dict*/
! 	0, /*tp_descr_get*/
! 	0, /*tp_descr_set*/
! 	0, /*tp_dictoffset*/
! 	DragObj_tp_init, /* tp_init */
! 	DragObj_tp_alloc, /* tp_alloc */
! 	DragObj_tp_new, /* tp_new */
! 	DragObj_tp_free, /* tp_free */
  };
  
***************
*** 1110,1115 ****
  	DragObj_Type.ob_type = &PyType_Type;
  	Py_INCREF(&DragObj_Type);
! 	if (PyDict_SetItemString(d, "DragObjType", (PyObject *)&DragObj_Type) != 0)
! 		Py_FatalError("can't initialize DragObjType");
  
  	dragglue_TrackingHandlerUPP = NewDragTrackingHandlerUPP(dragglue_TrackingHandler);
--- 1137,1144 ----
  	DragObj_Type.ob_type = &PyType_Type;
  	Py_INCREF(&DragObj_Type);
! 	PyModule_AddObject(m, "DragObj", (PyObject *)&DragObj_Type);
! 	/* Backward-compatible name */
! 	Py_INCREF(&DragObj_Type);
! 	PyModule_AddObject(m, "DragObjType", (PyObject *)&DragObj_Type);
  
  	dragglue_TrackingHandlerUPP = NewDragTrackingHandlerUPP(dragglue_TrackingHandler);

Index: dragsupport.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/drag/dragsupport.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** dragsupport.py	29 Nov 2002 23:40:43 -0000	1.11
--- dragsupport.py	3 Dec 2002 23:40:20 -0000	1.12
***************
*** 184,188 ****
  """    
  
! class MyObjectDefinition(PEP252Mixin, GlobalObjectDefinition):
  	def outputCheckNewArg(self):
  		Output("""if (itself == NULL) {
--- 184,188 ----
  """    
  
! class MyObjectDefinition(PEP253Mixin, GlobalObjectDefinition):
  	def outputCheckNewArg(self):
  		Output("""if (itself == NULL) {