[Python-checkins] python/dist/src/Mac/Modules/folder _Foldermodule.c,1.1,1.1.6.1 foldersupport.py,1.1,1.1.6.1
jackjansen@users.sourceforge.net
jackjansen@users.sourceforge.net
Fri, 18 Apr 2003 01:59:15 -0700
Update of /cvsroot/python/python/dist/src/Mac/Modules/folder
In directory sc8-pr-cvs1:/tmp/cvs-serv28363/Mac/Modules/folder
Modified Files:
Tag: getargs_mask_mods
_Foldermodule.c foldersupport.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: _Foldermodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/folder/_Foldermodule.c,v
retrieving revision 1.1
retrieving revision 1.1.6.1
diff -C2 -d -r1.1 -r1.1.6.1
*** _Foldermodule.c 22 Nov 2002 14:58:35 -0000 1.1
--- _Foldermodule.c 18 Apr 2003 08:58:42 -0000 1.1.6.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)
***************
*** 39,43 ****
short foundVRefNum;
long foundDirID;
! if (!PyArg_ParseTuple(_args, "hO&b",
&vRefNum,
PyMac_GetOSType, &folderType,
--- 39,43 ----
short foundVRefNum;
long foundDirID;
! if (!PyArg_ParseTuple(_args, "HO&b",
&vRefNum,
PyMac_GetOSType, &folderType,
***************
*** 50,54 ****
&foundDirID);
if (_err != noErr) return PyMac_Error(_err);
! _res = Py_BuildValue("hl",
foundVRefNum,
foundDirID);
--- 50,54 ----
&foundDirID);
if (_err != noErr) return PyMac_Error(_err);
! _res = Py_BuildValue("Hl",
foundVRefNum,
foundDirID);
***************
*** 62,66 ****
short vRefNum;
OSType folderType;
! if (!PyArg_ParseTuple(_args, "hO&",
&vRefNum,
PyMac_GetOSType, &folderType))
--- 62,66 ----
short vRefNum;
OSType folderType;
! if (!PyArg_ParseTuple(_args, "HO&",
&vRefNum,
PyMac_GetOSType, &folderType))
***************
*** 82,86 ****
Boolean createFolder;
FSRef foundRef;
! if (!PyArg_ParseTuple(_args, "hO&b",
&vRefNum,
PyMac_GetOSType, &folderType,
--- 82,86 ----
Boolean createFolder;
FSRef foundRef;
! if (!PyArg_ParseTuple(_args, "HO&b",
&vRefNum,
PyMac_GetOSType, &folderType,
***************
*** 109,113 ****
Str255 name;
Boolean replaceFlag;
! if (!PyArg_ParseTuple(_args, "O&lO&O&O&O&O&b",
PyMac_GetOSType, &foldType,
&flags,
--- 109,113 ----
Str255 name;
Boolean replaceFlag;
! if (!PyArg_ParseTuple(_args, "O&kO&O&O&O&O&b",
PyMac_GetOSType, &foldType,
&flags,
***************
*** 140,144 ****
UInt32 totalTypeCount;
FolderType theTypes;
! if (!PyArg_ParseTuple(_args, "l",
&requestedTypeCount))
return NULL;
--- 140,144 ----
UInt32 totalTypeCount;
FolderType theTypes;
! if (!PyArg_ParseTuple(_args, "k",
&requestedTypeCount))
return NULL;
***************
*** 147,151 ****
&theTypes);
if (_err != noErr) return PyMac_Error(_err);
! _res = Py_BuildValue("lO&",
totalTypeCount,
PyMac_BuildOSType, theTypes);
--- 147,151 ----
&theTypes);
if (_err != noErr) return PyMac_Error(_err);
! _res = Py_BuildValue("kO&",
totalTypeCount,
PyMac_BuildOSType, theTypes);
***************
*** 176,180 ****
short foundVRefNum;
Str255 name;
! if (!PyArg_ParseTuple(_args, "hO&O&",
&vRefNum,
PyMac_GetOSType, &foldType,
--- 176,180 ----
short foundVRefNum;
Str255 name;
! if (!PyArg_ParseTuple(_args, "HO&O&",
&vRefNum,
PyMac_GetOSType, &foldType,
***************
*** 186,190 ****
name);
if (_err != noErr) return PyMac_Error(_err);
! _res = Py_BuildValue("h",
foundVRefNum);
return _res;
--- 186,190 ----
name);
if (_err != noErr) return PyMac_Error(_err);
! _res = Py_BuildValue("H",
foundVRefNum);
return _res;
***************
*** 200,204 ****
RoutingFlags flags;
Boolean replaceFlag;
! if (!PyArg_ParseTuple(_args, "O&O&O&lb",
PyMac_GetOSType, &fileType,
PyMac_GetOSType, &routeFromFolder,
--- 200,204 ----
RoutingFlags flags;
Boolean replaceFlag;
! if (!PyArg_ParseTuple(_args, "O&O&O&kb",
PyMac_GetOSType, &fileType,
PyMac_GetOSType, &routeFromFolder,
***************
*** 253,257 ****
&flags);
if (_err != noErr) return PyMac_Error(_err);
! _res = Py_BuildValue("O&l",
PyMac_BuildOSType, routeToFolder,
flags);
--- 253,257 ----
&flags);
if (_err != noErr) return PyMac_Error(_err);
! _res = Py_BuildValue("O&k",
PyMac_BuildOSType, routeToFolder,
flags);
***************
*** 265,269 ****
short vRefNum;
long dirID;
! if (!PyArg_ParseTuple(_args, "hl",
&vRefNum,
&dirID))
--- 265,269 ----
short vRefNum;
long dirID;
! if (!PyArg_ParseTuple(_args, "Hl",
&vRefNum,
&dirID))
***************
*** 284,288 ****
long dirID;
FolderType foldType;
! if (!PyArg_ParseTuple(_args, "hl",
&vRefNum,
&dirID))
--- 284,288 ----
long dirID;
FolderType foldType;
! if (!PyArg_ParseTuple(_args, "Hl",
&vRefNum,
&dirID))
Index: foldersupport.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/folder/foldersupport.py,v
retrieving revision 1.1
retrieving revision 1.1.6.1
diff -C2 -d -r1.1 -r1.1.6.1
*** foldersupport.py 22 Nov 2002 14:58:35 -0000 1.1
--- foldersupport.py 18 Apr 2003 08:58:42 -0000 1.1.6.1
***************
*** 22,30 ****
FolderClass = OSTypeType("FolderClass")
# FolderDesc
! FolderDescFlags = Type("FolderDescFlags", "l")
FolderLocation = OSTypeType("FolderLocation")
# FolderRouting
FolderType = OSTypeType("FolderType")
! RoutingFlags = Type("RoutingFlags", "l")
--- 22,30 ----
FolderClass = OSTypeType("FolderClass")
# FolderDesc
! FolderDescFlags = Type("FolderDescFlags", "k")
FolderLocation = OSTypeType("FolderLocation")
# FolderRouting
FolderType = OSTypeType("FolderType")
! RoutingFlags = Type("RoutingFlags", "k")