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).

2 files changed, 2 insertions, 55 deletions

diff --git a/Mac/Modules/cm/_Cmmodule.c b/Mac/Modules/cm/_Cmmodule.c
index 1737fef..e21e6b0 100644
--- a/Mac/Modules/cm/_Cmmodule.c
+++ b/Mac/Modules/cm/_Cmmodule.c
@@ -186,44 +186,6 @@ static PyObject *CmpInstObj_SetComponentInstanceStorage(ComponentInstanceObject
 	return _res;
 }
 
-#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)
 {
 	PyObject *_res = NULL;
@@ -286,16 +248,6 @@ static PyMethodDef CmpInstObj_methods[] = {
 	 PyDoc_STR("() -> (Handle _rv)")},
 	{"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)")},
 	{"GetComponentVersion", (PyCFunction)CmpInstObj_GetComponentVersion, 1,
diff --git a/Mac/Modules/cm/cmscan.py b/Mac/Modules/cm/cmscan.py
index 7ca15f2..6e56cb2 100644
--- a/Mac/Modules/cm/cmscan.py
+++ b/Mac/Modules/cm/cmscan.py
@@ -59,15 +59,10 @@ class MyScanner(Scanner):
 			"OpenAComponent",
 			"GetComponentPublicResource", # Missing in CW Pro 6
 			"CallComponentGetPublicResource", # Missing in CW Pro 6
+			'SetComponentInstanceA5',
+			'GetComponentInstanceA5',
 			]
 
-	def makegreylist(self):
-		return [
-			('#if !TARGET_API_MAC_CARBON', [
-				'SetComponentInstanceA5',
-				'GetComponentInstanceA5',
-			])]
-
 	def makeblacklisttypes(self):
 		return [
 			"ResourceSpec",