[Python-checkins] python/dist/src/Mac/Modules/cm _Cmmodule.c,1.12,1.13 cmscan.py,1.10,1.11

[jackjansen@users.sourceforge.net]

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

Modified Files:
	_Cmmodule.c cmscan.py 
Log Message:
Getting rid of pre-Carbon (MacOS8) support. All code depending on
TARGET_API_MAC_OS8 (or !TARGET_API_MAC_CARBON) is gone. Also some
TARGET_API_MAC_OSX conditional code is gone, because it is no longer
used on OSX-only Python (only in MacPython-OS9).


Index: _Cmmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/cm/_Cmmodule.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** _Cmmodule.c	3 Dec 2002 23:40:19 -0000	1.12
--- _Cmmodule.c	12 Dec 2002 10:31:50 -0000	1.13
***************
*** 187,228 ****
  }
  
- #if !TARGET_API_MAC_CARBON
- 
- static PyObject *CmpInstObj_GetComponentInstanceA5(ComponentInstanceObject *_self, PyObject *_args)
- {
- 	PyObject *_res = NULL;
- 	long _rv;
- #ifndef GetComponentInstanceA5
- 	PyMac_PRECHECK(GetComponentInstanceA5);
- #endif
- 	if (!PyArg_ParseTuple(_args, ""))
- 		return NULL;
- 	_rv = GetComponentInstanceA5(_self->ob_itself);
- 	_res = Py_BuildValue("l",
- 	                     _rv);
- 	return _res;
- }
- #endif
- 
- #if !TARGET_API_MAC_CARBON
- 
- static PyObject *CmpInstObj_SetComponentInstanceA5(ComponentInstanceObject *_self, PyObject *_args)
- {
- 	PyObject *_res = NULL;
- 	long theA5;
- #ifndef SetComponentInstanceA5
- 	PyMac_PRECHECK(SetComponentInstanceA5);
- #endif
- 	if (!PyArg_ParseTuple(_args, "l",
- 	                      &theA5))
- 		return NULL;
- 	SetComponentInstanceA5(_self->ob_itself,
- 	                       theA5);
- 	Py_INCREF(Py_None);
- 	_res = Py_None;
- 	return _res;
- }
- #endif
- 
  static PyObject *CmpInstObj_ComponentFunctionImplemented(ComponentInstanceObject *_self, PyObject *_args)
  {
--- 187,190 ----
***************
*** 287,300 ****
  	{"SetComponentInstanceStorage", (PyCFunction)CmpInstObj_SetComponentInstanceStorage, 1,
  	 PyDoc_STR("(Handle theStorage) -> None")},
- 
- #if !TARGET_API_MAC_CARBON
- 	{"GetComponentInstanceA5", (PyCFunction)CmpInstObj_GetComponentInstanceA5, 1,
- 	 PyDoc_STR("() -> (long _rv)")},
- #endif
- 
- #if !TARGET_API_MAC_CARBON
- 	{"SetComponentInstanceA5", (PyCFunction)CmpInstObj_SetComponentInstanceA5, 1,
- 	 PyDoc_STR("(long theA5) -> None")},
- #endif
  	{"ComponentFunctionImplemented", (PyCFunction)CmpInstObj_ComponentFunctionImplemented, 1,
  	 PyDoc_STR("(short ftnNumber) -> (long _rv)")},
--- 249,252 ----

Index: cmscan.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/cm/cmscan.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** cmscan.py	15 Aug 2002 21:48:13 -0000	1.10
--- cmscan.py	12 Dec 2002 10:31:50 -0000	1.11
***************
*** 60,71 ****
  			"GetComponentPublicResource", # Missing in CW Pro 6
  			"CallComponentGetPublicResource", # Missing in CW Pro 6
  			]
- 
- 	def makegreylist(self):
- 		return [
- 			('#if !TARGET_API_MAC_CARBON', [
- 				'SetComponentInstanceA5',
- 				'GetComponentInstanceA5',
- 			])]
  
  	def makeblacklisttypes(self):
--- 60,66 ----
  			"GetComponentPublicResource", # Missing in CW Pro 6
  			"CallComponentGetPublicResource", # Missing in CW Pro 6
+ 			'SetComponentInstanceA5',
+ 			'GetComponentInstanceA5',
  			]
  
  	def makeblacklisttypes(self):