[Python-checkins] python/dist/src/Mac/Modules/qdoffs _Qdoffsmodule.c,1.10,1.11 qdoffssupport.py,1.9,1.10

[jackjansen@users.sourceforge.net]

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

Modified Files:
	_Qdoffsmodule.c qdoffssupport.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: _Qdoffsmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/qdoffs/_Qdoffsmodule.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** _Qdoffsmodule.c	29 Nov 2002 23:40:46 -0000	1.10
--- _Qdoffsmodule.c	3 Dec 2002 23:40:21 -0000	1.11
***************
*** 134,137 ****
--- 134,138 ----
  #define GWorldObj_getsetlist NULL
  
+ 
  #define GWorldObj_compare NULL
  
***************
*** 139,142 ****
--- 140,161 ----
  
  #define GWorldObj_hash NULL
+ #define GWorldObj_tp_init 0
+ 
+ #define GWorldObj_tp_alloc PyType_GenericAlloc
+ 
+ static PyObject *GWorldObj_tp_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
+ {
+ 	PyObject *self;
+ 	GWorldPtr itself;
+ 	char *kw[] = {"itself", 0};
+ 
+ 	if (!PyArg_ParseTupleAndKeywords(args, kwds, "O&", kw, GWorldObj_Convert, &itself)) return NULL;
+ 	if ((self = type->tp_alloc(type, 0)) == NULL) return NULL;
+ 	((GWorldObject *)self)->ob_itself = itself;
+ 	return self;
+ }
+ 
+ #define GWorldObj_tp_free PyObject_Del
+ 
  
  PyTypeObject GWorld_Type = {
***************
*** 161,177 ****
  	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*/
  	GWorldObj_methods, /* tp_methods */
! 	0, /*outputHook_tp_members*/
  	GWorldObj_getsetlist, /*tp_getset*/
! 	0, /*outputHook_tp_base*/
  };
  
--- 180,204 ----
  	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*/
  	GWorldObj_methods, /* tp_methods */
! 	0, /*tp_members*/
  	GWorldObj_getsetlist, /*tp_getset*/
! 	0, /*tp_base*/
! 	0, /*tp_dict*/
! 	0, /*tp_descr_get*/
! 	0, /*tp_descr_set*/
! 	0, /*tp_dictoffset*/
! 	GWorldObj_tp_init, /* tp_init */
! 	GWorldObj_tp_alloc, /* tp_alloc */
! 	GWorldObj_tp_new, /* tp_new */
! 	GWorldObj_tp_free, /* tp_free */
  };
  
***************
*** 685,690 ****
  	GWorld_Type.ob_type = &PyType_Type;
  	Py_INCREF(&GWorld_Type);
! 	if (PyDict_SetItemString(d, "GWorldType", (PyObject *)&GWorld_Type) != 0)
! 		Py_FatalError("can't initialize GWorldType");
  }
  
--- 712,719 ----
  	GWorld_Type.ob_type = &PyType_Type;
  	Py_INCREF(&GWorld_Type);
! 	PyModule_AddObject(m, "GWorld", (PyObject *)&GWorld_Type);
! 	/* Backward-compatible name */
! 	Py_INCREF(&GWorld_Type);
! 	PyModule_AddObject(m, "GWorldType", (PyObject *)&GWorld_Type);
  }
  

Index: qdoffssupport.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/qdoffs/qdoffssupport.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** qdoffssupport.py	29 Nov 2002 23:40:46 -0000	1.9
--- qdoffssupport.py	3 Dec 2002 23:40:21 -0000	1.10
***************
*** 58,62 ****
  """
  
! class MyObjectDefinition(PEP252Mixin, GlobalObjectDefinition):
  	def outputCheckNewArg(self):
  		Output("if (itself == NULL) return PyMac_Error(resNotFound);")
--- 58,63 ----
  """
  
! class MyObjectDefinition(PEP253Mixin, GlobalObjectDefinition):
! 	# XXXX Should inherit from GrafPtr?
  	def outputCheckNewArg(self):
  		Output("if (itself == NULL) return PyMac_Error(resNotFound);")