[Python-checkins] python/dist/src/Mac/Modules/ae _AEmodule.c,1.19,1.19.4.1 aesupport.py,1.30,1.30.4.1

[jackjansen@users.sourceforge.net]

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

Modified Files:
      Tag: getargs_mask_mods
	_AEmodule.c aesupport.py 
Log Message:
Fixes for the new PyArg_ParseTuple k and K format chars, and the
changed semantics of h. Only lightly tested, but the IDE works
again.

These changes may not be needed anymore now that the semantic change
to h has been reverted, so I'm checking it in on a branch.


Index: _AEmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/ae/_AEmodule.c,v
retrieving revision 1.19
retrieving revision 1.19.4.1
diff -C2 -d -r1.19 -r1.19.4.1
*** _AEmodule.c	17 Jan 2003 23:11:17 -0000	1.19
--- _AEmodule.c	18 Apr 2003 08:58:31 -0000	1.19.4.1
***************
*** 15,21 ****
  /* Macro to test whether a weak-loaded CFM function exists */
  #define PyMac_PRECHECK(rtn) do { if ( &rtn == NULL )  {\
!     	PyErr_SetString(PyExc_NotImplementedError, \
!     	"Not available in this shared library/OS version"); \
!     	return NULL; \
      }} while(0)
  
--- 15,21 ----
  /* Macro to test whether a weak-loaded CFM function exists */
  #define PyMac_PRECHECK(rtn) do { if ( &rtn == NULL )  {\
!         PyErr_SetString(PyExc_NotImplementedError, \
!         "Not available in this shared library/OS version"); \
!         return NULL; \
      }} while(0)
  
***************
*** 636,640 ****
  	PyMac_PRECHECK(AESend);
  #endif
! 	if (!PyArg_ParseTuple(_args, "lhl",
  	                      &sendMode,
  	                      &sendPriority,
--- 636,640 ----
  	PyMac_PRECHECK(AESend);
  #endif
! 	if (!PyArg_ParseTuple(_args, "khl",
  	                      &sendMode,
  	                      &sendPriority,
***************
*** 751,755 ****
  	PyMac_PRECHECK(AEResolve);
  #endif
! 	if (!PyArg_ParseTuple(_args, "h",
  	                      &callbackFlags))
  		return NULL;
--- 751,755 ----
  	PyMac_PRECHECK(AEResolve);
  #endif
! 	if (!PyArg_ParseTuple(_args, "H",
  	                      &callbackFlags))
  		return NULL;
***************
*** 1039,1043 ****
  	PyMac_PRECHECK(AECreateAppleEvent);
  #endif
! 	if (!PyArg_ParseTuple(_args, "O&O&O&hl",
  	                      PyMac_GetOSType, &theAEEventClass,
  	                      PyMac_GetOSType, &theAEEventID,
--- 1039,1043 ----
  	PyMac_PRECHECK(AECreateAppleEvent);
  #endif
! 	if (!PyArg_ParseTuple(_args, "O&O&O&hk",
  	                      PyMac_GetOSType, &theAEEventClass,
  	                      PyMac_GetOSType, &theAEEventID,

Index: aesupport.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/ae/aesupport.py,v
retrieving revision 1.30
retrieving revision 1.30.4.1
diff -C2 -d -r1.30 -r1.30.4.1
*** aesupport.py	17 Jan 2003 23:11:17 -0000	1.30
--- aesupport.py	18 Apr 2003 08:58:31 -0000	1.30.4.1
***************
*** 9,17 ****
  
  AEArrayType = Type("AEArrayType", "c")
! AESendMode = Type("AESendMode", "l")
  AESendPriority = Type("AESendPriority", "h")
  AEInteractAllowed = Type("AEInteractAllowed", "b")
  AEReturnID = Type("AEReturnID", "h")
! AETransactionID = Type("AETransactionID", "l")
  
  
--- 9,17 ----
  
  AEArrayType = Type("AEArrayType", "c")
! AESendMode = Type("AESendMode", "k")
  AESendPriority = Type("AESendPriority", "h")
  AEInteractAllowed = Type("AEInteractAllowed", "b")
  AEReturnID = Type("AEReturnID", "h")
! AETransactionID = Type("AETransactionID", "k")