[Python-checkins] python/dist/src/Mac/Modules/ae _AEmodule.c,1.14,1.15 aescan.py,1.15,1.16

2002年12月12日 02:32:22 -0800

Update of /cvsroot/python/python/dist/src/Mac/Modules/ae
In directory sc8-pr-cvs1:/tmp/cvs-serv21368/Modules/ae
Modified Files:
	_AEmodule.c aescan.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: _AEmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/ae/_AEmodule.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** _AEmodule.c	3 Dec 2002 23:40:18 -0000	1.14
--- _AEmodule.c	12 Dec 2002 10:31:49 -0000	1.15
***************
*** 611,616 ****
 }
 
- #if TARGET_API_MAC_CARBON
- 
 static PyObject *AEDesc_AEGetDescDataSize(AEDescObject *_self, PyObject *_args)
 {
--- 611,614 ----
***************
*** 627,631 ****
 	return _res;
 }
- #endif
 
 static PyObject *AEDesc_AESend(AEDescObject *_self, PyObject *_args)
--- 625,628 ----
***************
*** 808,816 ****
 	{"AEPutAttributeDesc", (PyCFunction)AEDesc_AEPutAttributeDesc, 1,
 	 PyDoc_STR("(AEKeyword theAEKeyword, AEDesc theAEDesc) -> None")},
- 
- #if TARGET_API_MAC_CARBON
 	{"AEGetDescDataSize", (PyCFunction)AEDesc_AEGetDescDataSize, 1,
 	 PyDoc_STR("() -> (Size _rv)")},
- #endif
 	{"AESend", (PyCFunction)AEDesc_AESend, 1,
 	 PyDoc_STR("(AESendMode sendMode, AESendPriority sendPriority, long timeOutInTicks) -> (AppleEvent reply)")},
--- 805,810 ----
***************
*** 1049,1054 ****
 }
 
- #if TARGET_API_MAC_CARBON
- 
 static PyObject *AE_AEReplaceDescData(PyObject *_self, PyObject *_args)
 {
--- 1043,1046 ----
***************
*** 1076,1080 ****
 	return _res;
 }
- #endif
 
 static PyObject *AE_AEProcessAppleEvent(PyObject *_self, PyObject *_args)
--- 1068,1071 ----
***************
*** 1361,1369 ****
 	{"AECreateAppleEvent", (PyCFunction)AE_AECreateAppleEvent, 1,
 	 PyDoc_STR("(AEEventClass theAEEventClass, AEEventID theAEEventID, AEAddressDesc target, AEReturnID returnID, AETransactionID transactionID) -> (AppleEvent result)")},
- 
- #if TARGET_API_MAC_CARBON
 	{"AEReplaceDescData", (PyCFunction)AE_AEReplaceDescData, 1,
 	 PyDoc_STR("(DescType typeCode, Buffer dataPtr) -> (AEDesc theAEDesc)")},
- #endif
 	{"AEProcessAppleEvent", (PyCFunction)AE_AEProcessAppleEvent, 1,
 	 PyDoc_STR("(EventRecord theEventRecord) -> None")},
--- 1352,1357 ----
Index: aescan.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/ae/aescan.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** aescan.py	15 Aug 2002 21:48:12 -0000	1.15
--- aescan.py	12 Dec 2002 10:31:50 -0000	1.16
***************
*** 52,61 ****
 			]
 
- 	def makegreylist(self):
- 		return [
- 			('#if TARGET_API_MAC_CARBON', [
- 				'AEGetDescDataSize',
- 				'AEReplaceDescData',
- 			])]
 	def makeblacklisttypes(self):
 		return [
--- 52,55 ----