[Python-checkins] python/dist/src/Mac/Modules/res _Resmodule.c,1.16,1.17 resscan.py,1.18,1.19
jackjansen@users.sourceforge.net
jackjansen@users.sourceforge.net
Thu, 12 Dec 2002 02:31:55 -0800
Update of /cvsroot/python/python/dist/src/Mac/Modules/res
In directory sc8-pr-cvs1:/tmp/cvs-serv21368/Modules/res
Modified Files:
_Resmodule.c resscan.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: _Resmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/res/_Resmodule.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** _Resmodule.c 5 Dec 2002 23:26:38 -0000 1.16
--- _Resmodule.c 12 Dec 2002 10:31:52 -0000 1.17
***************
*** 312,337 ****
}
- #if TARGET_API_MAC_OS8
-
- static PyObject *ResObj_RsrcMapEntry(ResourceObject *_self, PyObject *_args)
- {
- PyObject *_res = NULL;
- long _rv;
- #ifndef RsrcMapEntry
- PyMac_PRECHECK(RsrcMapEntry);
- #endif
- if (!PyArg_ParseTuple(_args, ""))
- return NULL;
- _rv = RsrcMapEntry(_self->ob_itself);
- {
- OSErr _err = ResError();
- if (_err != noErr) return PyMac_Error(_err);
- }
- _res = Py_BuildValue("l",
- _rv);
- return _res;
- }
- #endif
-
static PyObject *ResObj_SetResAttrs(ResourceObject *_self, PyObject *_args)
{
--- 312,315 ----
***************
*** 524,532 ****
{"GetMaxResourceSize", (PyCFunction)ResObj_GetMaxResourceSize, 1,
PyDoc_STR("() -> (long _rv)")},
-
- #if TARGET_API_MAC_OS8
- {"RsrcMapEntry", (PyCFunction)ResObj_RsrcMapEntry, 1,
- PyDoc_STR("() -> (long _rv)")},
- #endif
{"SetResAttrs", (PyCFunction)ResObj_SetResAttrs, 1,
PyDoc_STR("(short attrs) -> None")},
--- 502,505 ----
***************
*** 703,749 ****
- #if TARGET_API_MAC_OS8
-
- static PyObject *Res_InitResources(PyObject *_self, PyObject *_args)
- {
- PyObject *_res = NULL;
- short _rv;
- #ifndef InitResources
- PyMac_PRECHECK(InitResources);
- #endif
- if (!PyArg_ParseTuple(_args, ""))
- return NULL;
- _rv = InitResources();
- {
- OSErr _err = ResError();
- if (_err != noErr) return PyMac_Error(_err);
- }
- _res = Py_BuildValue("h",
- _rv);
- return _res;
- }
- #endif
-
- #if TARGET_API_MAC_OS8
-
- static PyObject *Res_RsrcZoneInit(PyObject *_self, PyObject *_args)
- {
- PyObject *_res = NULL;
- #ifndef RsrcZoneInit
- PyMac_PRECHECK(RsrcZoneInit);
- #endif
- if (!PyArg_ParseTuple(_args, ""))
- return NULL;
- RsrcZoneInit();
- {
- OSErr _err = ResError();
- if (_err != noErr) return PyMac_Error(_err);
- }
- Py_INCREF(Py_None);
- _res = Py_None;
- return _res;
- }
- #endif
-
static PyObject *Res_CloseResFile(PyObject *_self, PyObject *_args)
{
--- 676,679 ----
***************
*** 801,851 ****
}
- #if TARGET_API_MAC_OS8
-
- static PyObject *Res_CreateResFile(PyObject *_self, PyObject *_args)
- {
- PyObject *_res = NULL;
- Str255 fileName;
- #ifndef CreateResFile
- PyMac_PRECHECK(CreateResFile);
- #endif
- if (!PyArg_ParseTuple(_args, "O&",
- PyMac_GetStr255, fileName))
- return NULL;
- CreateResFile(fileName);
- {
- OSErr _err = ResError();
- if (_err != noErr) return PyMac_Error(_err);
- }
- Py_INCREF(Py_None);
- _res = Py_None;
- return _res;
- }
- #endif
-
- #if TARGET_API_MAC_OS8
-
- static PyObject *Res_OpenResFile(PyObject *_self, PyObject *_args)
- {
- PyObject *_res = NULL;
- short _rv;
- Str255 fileName;
- #ifndef OpenResFile
- PyMac_PRECHECK(OpenResFile);
- #endif
- if (!PyArg_ParseTuple(_args, "O&",
- PyMac_GetStr255, fileName))
- return NULL;
- _rv = OpenResFile(fileName);
- {
- OSErr _err = ResError();
- if (_err != noErr) return PyMac_Error(_err);
- }
- _res = Py_BuildValue("h",
- _rv);
- return _res;
- }
- #endif
-
static PyObject *Res_UseResFile(PyObject *_self, PyObject *_args)
{
--- 731,734 ----
***************
*** 1309,1339 ****
}
- #if TARGET_API_MAC_OS8
-
- static PyObject *Res_RGetResource(PyObject *_self, PyObject *_args)
- {
- PyObject *_res = NULL;
- Handle _rv;
- ResType theType;
- short theID;
- #ifndef RGetResource
- PyMac_PRECHECK(RGetResource);
- #endif
- if (!PyArg_ParseTuple(_args, "O&h",
- PyMac_GetOSType, &theType,
- &theID))
- return NULL;
- _rv = RGetResource(theType,
- theID);
- {
- OSErr _err = ResError();
- if (_err != noErr) return PyMac_Error(_err);
- }
- _res = Py_BuildValue("O&",
- ResObj_New, _rv);
- return _res;
- }
- #endif
-
static PyObject *Res_HOpenResFile(PyObject *_self, PyObject *_args)
{
--- 1192,1195 ----
***************
*** 1445,1450 ****
}
- #if TARGET_API_MAC_CARBON
-
static PyObject *Res_InsertResourceFile(PyObject *_self, PyObject *_args)
{
--- 1301,1304 ----
***************
*** 1467,1473 ****
return _res;
}
- #endif
-
- #if TARGET_API_MAC_CARBON
static PyObject *Res_DetachResourceFile(PyObject *_self, PyObject *_args)
--- 1321,1324 ----
***************
*** 1488,1494 ****
return _res;
}
- #endif
-
- #if TARGET_API_MAC_CARBON
static PyObject *Res_FSpResourceFileAlreadyOpen(PyObject *_self, PyObject *_args)
--- 1339,1342 ----
***************
*** 1518,1524 ****
return _res;
}
- #endif
-
- #if TARGET_API_MAC_CARBON
static PyObject *Res_FSpOpenOrphanResFile(PyObject *_self, PyObject *_args)
--- 1366,1369 ----
***************
*** 1544,1550 ****
return _res;
}
- #endif
-
- #if TARGET_API_MAC_CARBON
static PyObject *Res_GetTopResourceFile(PyObject *_self, PyObject *_args)
--- 1389,1392 ----
***************
*** 1564,1570 ****
return _res;
}
- #endif
-
- #if TARGET_API_MAC_CARBON
static PyObject *Res_GetNextResourceFile(PyObject *_self, PyObject *_args)
--- 1406,1409 ----
***************
*** 1587,1591 ****
return _res;
}
- #endif
static PyObject *Res_FSOpenResFile(PyObject *_self, PyObject *_args)
--- 1426,1429 ----
***************
*** 1673,1678 ****
}
- #if TARGET_API_MAC_CARBON
-
static PyObject *Res_FSCreateResourceFile(PyObject *_self, PyObject *_args)
{
--- 1511,1514 ----
***************
*** 1711,1717 ****
return _res;
}
- #endif
-
- #if TARGET_API_MAC_CARBON
static PyObject *Res_FSOpenResourceFile(PyObject *_self, PyObject *_args)
--- 1547,1550 ----
***************
*** 1743,1747 ****
return _res;
}
- #endif
static PyObject *Res_Handle(PyObject *_self, PyObject *_args)
--- 1576,1579 ----
***************
*** 1772,1785 ****
static PyMethodDef Res_methods[] = {
-
- #if TARGET_API_MAC_OS8
- {"InitResources", (PyCFunction)Res_InitResources, 1,
- PyDoc_STR("() -> (short _rv)")},
- #endif
-
- #if TARGET_API_MAC_OS8
- {"RsrcZoneInit", (PyCFunction)Res_RsrcZoneInit, 1,
- PyDoc_STR("() -> None")},
- #endif
{"CloseResFile", (PyCFunction)Res_CloseResFile, 1,
PyDoc_STR("(short refNum) -> None")},
--- 1604,1607 ----
***************
*** 1788,1801 ****
{"CurResFile", (PyCFunction)Res_CurResFile, 1,
PyDoc_STR("() -> (short _rv)")},
-
- #if TARGET_API_MAC_OS8
- {"CreateResFile", (PyCFunction)Res_CreateResFile, 1,
- PyDoc_STR("(Str255 fileName) -> None")},
- #endif
-
- #if TARGET_API_MAC_OS8
- {"OpenResFile", (PyCFunction)Res_OpenResFile, 1,
- PyDoc_STR("(Str255 fileName) -> (short _rv)")},
- #endif
{"UseResFile", (PyCFunction)Res_UseResFile, 1,
PyDoc_STR("(short refNum) -> None")},
--- 1610,1613 ----
***************
*** 1840,1848 ****
{"OpenRFPerm", (PyCFunction)Res_OpenRFPerm, 1,
PyDoc_STR("(Str255 fileName, short vRefNum, SignedByte permission) -> (short _rv)")},
-
- #if TARGET_API_MAC_OS8
- {"RGetResource", (PyCFunction)Res_RGetResource, 1,
- PyDoc_STR("(ResType theType, short theID) -> (Handle _rv)")},
- #endif
{"HOpenResFile", (PyCFunction)Res_HOpenResFile, 1,
PyDoc_STR("(short vRefNum, long dirID, Str255 fileName, SignedByte permission) -> (short _rv)")},
--- 1652,1655 ----
***************
*** 1853,1886 ****
{"FSpCreateResFile", (PyCFunction)Res_FSpCreateResFile, 1,
PyDoc_STR("(FSSpec spec, OSType creator, OSType fileType, ScriptCode scriptTag) -> None")},
-
- #if TARGET_API_MAC_CARBON
{"InsertResourceFile", (PyCFunction)Res_InsertResourceFile, 1,
PyDoc_STR("(SInt16 refNum, RsrcChainLocation where) -> None")},
- #endif
-
- #if TARGET_API_MAC_CARBON
{"DetachResourceFile", (PyCFunction)Res_DetachResourceFile, 1,
PyDoc_STR("(SInt16 refNum) -> None")},
- #endif
-
- #if TARGET_API_MAC_CARBON
{"FSpResourceFileAlreadyOpen", (PyCFunction)Res_FSpResourceFileAlreadyOpen, 1,
PyDoc_STR("(FSSpec resourceFile) -> (Boolean _rv, Boolean inChain, SInt16 refNum)")},
- #endif
-
- #if TARGET_API_MAC_CARBON
{"FSpOpenOrphanResFile", (PyCFunction)Res_FSpOpenOrphanResFile, 1,
PyDoc_STR("(FSSpec spec, SignedByte permission) -> (SInt16 refNum)")},
- #endif
-
- #if TARGET_API_MAC_CARBON
{"GetTopResourceFile", (PyCFunction)Res_GetTopResourceFile, 1,
PyDoc_STR("() -> (SInt16 refNum)")},
- #endif
-
- #if TARGET_API_MAC_CARBON
{"GetNextResourceFile", (PyCFunction)Res_GetNextResourceFile, 1,
PyDoc_STR("(SInt16 curRefNum) -> (SInt16 nextRefNum)")},
- #endif
{"FSOpenResFile", (PyCFunction)Res_FSOpenResFile, 1,
PyDoc_STR("(FSRef ref, SignedByte permission) -> (short _rv)")},
--- 1660,1675 ----
***************
*** 1889,1902 ****
{"FSResourceFileAlreadyOpen", (PyCFunction)Res_FSResourceFileAlreadyOpen, 1,
PyDoc_STR("(FSRef resourceFileRef) -> (Boolean _rv, Boolean inChain, SInt16 refNum)")},
-
- #if TARGET_API_MAC_CARBON
{"FSCreateResourceFile", (PyCFunction)Res_FSCreateResourceFile, 1,
PyDoc_STR("(FSRef parentRef, Buffer nameLength, Buffer forkNameLength) -> (FSRef newRef, FSSpec newSpec)")},
- #endif
-
- #if TARGET_API_MAC_CARBON
{"FSOpenResourceFile", (PyCFunction)Res_FSOpenResourceFile, 1,
PyDoc_STR("(FSRef ref, Buffer forkNameLength, SignedByte permissions) -> (SInt16 refNum)")},
- #endif
{"Handle", (PyCFunction)Res_Handle, 1,
PyDoc_STR("Convert a string to a Handle object.\n\nResource() and Handle() are very similar, but objects created with Handle() are\nby default automatically DisposeHandle()d upon object cleanup. Use AutoDispose()\nto change this.\n")},
--- 1678,1685 ----
Index: resscan.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/res/resscan.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** resscan.py 15 Aug 2002 21:48:15 -0000 1.18
--- resscan.py 12 Dec 2002 10:31:52 -0000 1.19
***************
*** 46,49 ****
--- 46,56 ----
## "SizeResource", # GetResourceSizeOnDisk
## "MaxSizeRsrc", # GetMaxResourceSize
+ # OS8 only
+ 'RGetResource',
+ 'OpenResFile',
+ 'CreateResFile',
+ 'RsrcZoneInit',
+ 'InitResources',
+ 'RsrcMapEntry',
]
***************
*** 52,76 ****
]
- def makegreylist(self):
- return [
- ('#if TARGET_API_MAC_OS8', [
- 'RGetResource',
- 'OpenResFile',
- 'CreateResFile',
- 'RsrcZoneInit',
- 'InitResources',
- 'RsrcMapEntry',
- ]),
- ('#if TARGET_API_MAC_CARBON', [
- 'GetNextResourceFile',
- 'GetTopResourceFile',
- 'FSpOpenOrphanResFile',
- 'DetachResourceFile',
- 'InsertResourceFile',
- 'FSpResourceFileAlreadyOpen',
- 'FSOpenResourceFile',
- 'FSCreateResourceFile',
- ])]
-
def makerepairinstructions(self):
return [
--- 59,62 ----