[Python-checkins] python/dist/src/Mac/Modules/cf _CFmodule.c,1.16,1.17

[jackjansen@users.sourceforge.net]

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

Modified Files:
	_CFmodule.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: _CFmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/cf/_CFmodule.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** _CFmodule.c	16 Aug 2002 09:09:16 -0000	1.16
--- _CFmodule.c	3 Dec 2002 23:40:19 -0000	1.17
***************
*** 4326,4367 ****
  	CFTypeRef_Type.ob_type = &PyType_Type;
  	Py_INCREF(&CFTypeRef_Type);
! 	if (PyDict_SetItemString(d, "CFTypeRefType", (PyObject *)&CFTypeRef_Type) != 0)
! 		Py_FatalError("can't initialize CFTypeRefType");
  	CFArrayRef_Type.ob_type = &PyType_Type;
  	Py_INCREF(&CFArrayRef_Type);
! 	if (PyDict_SetItemString(d, "CFArrayRefType", (PyObject *)&CFArrayRef_Type) != 0)
! 		Py_FatalError("can't initialize CFArrayRefType");
  	CFMutableArrayRef_Type.ob_type = &PyType_Type;
  	Py_INCREF(&CFMutableArrayRef_Type);
! 	if (PyDict_SetItemString(d, "CFMutableArrayRefType", (PyObject *)&CFMutableArrayRef_Type) != 0)
! 		Py_FatalError("can't initialize CFMutableArrayRefType");
  	CFDictionaryRef_Type.ob_type = &PyType_Type;
  	Py_INCREF(&CFDictionaryRef_Type);
! 	if (PyDict_SetItemString(d, "CFDictionaryRefType", (PyObject *)&CFDictionaryRef_Type) != 0)
! 		Py_FatalError("can't initialize CFDictionaryRefType");
  	CFMutableDictionaryRef_Type.ob_type = &PyType_Type;
  	Py_INCREF(&CFMutableDictionaryRef_Type);
! 	if (PyDict_SetItemString(d, "CFMutableDictionaryRefType", (PyObject *)&CFMutableDictionaryRef_Type) != 0)
! 		Py_FatalError("can't initialize CFMutableDictionaryRefType");
  	CFDataRef_Type.ob_type = &PyType_Type;
  	Py_INCREF(&CFDataRef_Type);
! 	if (PyDict_SetItemString(d, "CFDataRefType", (PyObject *)&CFDataRef_Type) != 0)
! 		Py_FatalError("can't initialize CFDataRefType");
  	CFMutableDataRef_Type.ob_type = &PyType_Type;
  	Py_INCREF(&CFMutableDataRef_Type);
! 	if (PyDict_SetItemString(d, "CFMutableDataRefType", (PyObject *)&CFMutableDataRef_Type) != 0)
! 		Py_FatalError("can't initialize CFMutableDataRefType");
  	CFStringRef_Type.ob_type = &PyType_Type;
  	Py_INCREF(&CFStringRef_Type);
! 	if (PyDict_SetItemString(d, "CFStringRefType", (PyObject *)&CFStringRef_Type) != 0)
! 		Py_FatalError("can't initialize CFStringRefType");
  	CFMutableStringRef_Type.ob_type = &PyType_Type;
  	Py_INCREF(&CFMutableStringRef_Type);
! 	if (PyDict_SetItemString(d, "CFMutableStringRefType", (PyObject *)&CFMutableStringRef_Type) != 0)
! 		Py_FatalError("can't initialize CFMutableStringRefType");
  	CFURLRef_Type.ob_type = &PyType_Type;
  	Py_INCREF(&CFURLRef_Type);
! 	if (PyDict_SetItemString(d, "CFURLRefType", (PyObject *)&CFURLRef_Type) != 0)
! 		Py_FatalError("can't initialize CFURLRefType");
  
  #define _STRINGCONST(name) PyModule_AddObject(m, #name, CFStringRefObj_New(name))
--- 4326,4387 ----
  	CFTypeRef_Type.ob_type = &PyType_Type;
  	Py_INCREF(&CFTypeRef_Type);
! 	PyModule_AddObject(m, "CFTypeRef", (PyObject *)&CFTypeRef_Type);
! 	/* Backward-compatible name */
! 	Py_INCREF(&CFTypeRef_Type);
! 	PyModule_AddObject(m, "CFTypeRefType", (PyObject *)&CFTypeRef_Type);
  	CFArrayRef_Type.ob_type = &PyType_Type;
  	Py_INCREF(&CFArrayRef_Type);
! 	PyModule_AddObject(m, "CFArrayRef", (PyObject *)&CFArrayRef_Type);
! 	/* Backward-compatible name */
! 	Py_INCREF(&CFArrayRef_Type);
! 	PyModule_AddObject(m, "CFArrayRefType", (PyObject *)&CFArrayRef_Type);
  	CFMutableArrayRef_Type.ob_type = &PyType_Type;
  	Py_INCREF(&CFMutableArrayRef_Type);
! 	PyModule_AddObject(m, "CFMutableArrayRef", (PyObject *)&CFMutableArrayRef_Type);
! 	/* Backward-compatible name */
! 	Py_INCREF(&CFMutableArrayRef_Type);
! 	PyModule_AddObject(m, "CFMutableArrayRefType", (PyObject *)&CFMutableArrayRef_Type);
  	CFDictionaryRef_Type.ob_type = &PyType_Type;
  	Py_INCREF(&CFDictionaryRef_Type);
! 	PyModule_AddObject(m, "CFDictionaryRef", (PyObject *)&CFDictionaryRef_Type);
! 	/* Backward-compatible name */
! 	Py_INCREF(&CFDictionaryRef_Type);
! 	PyModule_AddObject(m, "CFDictionaryRefType", (PyObject *)&CFDictionaryRef_Type);
  	CFMutableDictionaryRef_Type.ob_type = &PyType_Type;
  	Py_INCREF(&CFMutableDictionaryRef_Type);
! 	PyModule_AddObject(m, "CFMutableDictionaryRef", (PyObject *)&CFMutableDictionaryRef_Type);
! 	/* Backward-compatible name */
! 	Py_INCREF(&CFMutableDictionaryRef_Type);
! 	PyModule_AddObject(m, "CFMutableDictionaryRefType", (PyObject *)&CFMutableDictionaryRef_Type);
  	CFDataRef_Type.ob_type = &PyType_Type;
  	Py_INCREF(&CFDataRef_Type);
! 	PyModule_AddObject(m, "CFDataRef", (PyObject *)&CFDataRef_Type);
! 	/* Backward-compatible name */
! 	Py_INCREF(&CFDataRef_Type);
! 	PyModule_AddObject(m, "CFDataRefType", (PyObject *)&CFDataRef_Type);
  	CFMutableDataRef_Type.ob_type = &PyType_Type;
  	Py_INCREF(&CFMutableDataRef_Type);
! 	PyModule_AddObject(m, "CFMutableDataRef", (PyObject *)&CFMutableDataRef_Type);
! 	/* Backward-compatible name */
! 	Py_INCREF(&CFMutableDataRef_Type);
! 	PyModule_AddObject(m, "CFMutableDataRefType", (PyObject *)&CFMutableDataRef_Type);
  	CFStringRef_Type.ob_type = &PyType_Type;
  	Py_INCREF(&CFStringRef_Type);
! 	PyModule_AddObject(m, "CFStringRef", (PyObject *)&CFStringRef_Type);
! 	/* Backward-compatible name */
! 	Py_INCREF(&CFStringRef_Type);
! 	PyModule_AddObject(m, "CFStringRefType", (PyObject *)&CFStringRef_Type);
  	CFMutableStringRef_Type.ob_type = &PyType_Type;
  	Py_INCREF(&CFMutableStringRef_Type);
! 	PyModule_AddObject(m, "CFMutableStringRef", (PyObject *)&CFMutableStringRef_Type);
! 	/* Backward-compatible name */
! 	Py_INCREF(&CFMutableStringRef_Type);
! 	PyModule_AddObject(m, "CFMutableStringRefType", (PyObject *)&CFMutableStringRef_Type);
  	CFURLRef_Type.ob_type = &PyType_Type;
  	Py_INCREF(&CFURLRef_Type);
! 	PyModule_AddObject(m, "CFURLRef", (PyObject *)&CFURLRef_Type);
! 	/* Backward-compatible name */
! 	Py_INCREF(&CFURLRef_Type);
! 	PyModule_AddObject(m, "CFURLRefType", (PyObject *)&CFURLRef_Type);
  
  #define _STRINGCONST(name) PyModule_AddObject(m, #name, CFStringRefObj_New(name))