[Python-checkins] python/dist/src/Mac/Modules/file _Filemodule.c,1.10,1.11 filesupport.py,1.8,1.9
jackjansen@users.sourceforge.net
jackjansen@users.sourceforge.net
Thu, 26 Dec 2002 12:45:45 -0800
Update of /cvsroot/python/python/dist/src/Mac/Modules/file
In directory sc8-pr-cvs1:/tmp/cvs-serv31935
Modified Files:
_Filemodule.c filesupport.py
Log Message:
Second-argument alias methods were generated with a variation on
MethodGenerator, this should be OSErrMethodGenerator.
Index: _Filemodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/file/_Filemodule.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** _Filemodule.c 25 Dec 2002 22:45:28 -0000 1.10
--- _Filemodule.c 26 Dec 2002 20:45:43 -0000 1.11
***************
*** 321,325 ****
{
PyObject *_res = NULL;
! OSErr _rv;
FSSpec fromFile__buf__;
FSSpec *fromFile = &fromFile__buf__;
--- 321,325 ----
{
PyObject *_res = NULL;
! OSErr _err;
FSSpec fromFile__buf__;
FSSpec *fromFile = &fromFile__buf__;
***************
*** 329,338 ****
myPyMac_GetOptFSSpecPtr, &fromFile))
return NULL;
! _rv = ResolveAlias(fromFile,
! _self->ob_itself,
! &target,
! &wasChanged);
! _res = Py_BuildValue("hO&b",
! _rv,
FSSpec_New, &target,
wasChanged);
--- 329,338 ----
myPyMac_GetOptFSSpecPtr, &fromFile))
return NULL;
! _err = ResolveAlias(fromFile,
! _self->ob_itself,
! &target,
! &wasChanged);
! if (_err != noErr) return PyMac_Error(_err);
! _res = Py_BuildValue("O&b",
FSSpec_New, &target,
wasChanged);
***************
*** 361,365 ****
{
PyObject *_res = NULL;
! OSErr _rv;
FSSpec fromFile__buf__;
FSSpec *fromFile = &fromFile__buf__;
--- 361,365 ----
{
PyObject *_res = NULL;
! OSErr _err;
FSSpec fromFile__buf__;
FSSpec *fromFile = &fromFile__buf__;
***************
*** 371,381 ****
&mountFlags))
return NULL;
! _rv = ResolveAliasWithMountFlags(fromFile,
! _self->ob_itself,
! &target,
! &wasChanged,
! mountFlags);
! _res = Py_BuildValue("hO&b",
! _rv,
FSSpec_New, &target,
wasChanged);
--- 371,381 ----
&mountFlags))
return NULL;
! _err = ResolveAliasWithMountFlags(fromFile,
! _self->ob_itself,
! &target,
! &wasChanged,
! mountFlags);
! if (_err != noErr) return PyMac_Error(_err);
! _res = Py_BuildValue("O&b",
FSSpec_New, &target,
wasChanged);
***************
*** 386,390 ****
{
PyObject *_res = NULL;
! OSErr _rv;
FSSpec fromFile__buf__;
FSSpec *fromFile = &fromFile__buf__;
--- 386,390 ----
{
PyObject *_res = NULL;
! OSErr _err;
FSSpec fromFile__buf__;
FSSpec *fromFile = &fromFile__buf__;
***************
*** 396,406 ****
&logon))
return NULL;
! _rv = FollowFinderAlias(fromFile,
! _self->ob_itself,
! logon,
! &target,
! &wasChanged);
! _res = Py_BuildValue("hO&b",
! _rv,
FSSpec_New, &target,
wasChanged);
--- 396,406 ----
&logon))
return NULL;
! _err = FollowFinderAlias(fromFile,
! _self->ob_itself,
! logon,
! &target,
! &wasChanged);
! if (_err != noErr) return PyMac_Error(_err);
! _res = Py_BuildValue("O&b",
FSSpec_New, &target,
wasChanged);
***************
*** 411,415 ****
{
PyObject *_res = NULL;
! OSErr _rv;
FSRef fromFile__buf__;
FSRef *fromFile = &fromFile__buf__;
--- 411,415 ----
{
PyObject *_res = NULL;
! OSErr _err;
FSRef fromFile__buf__;
FSRef *fromFile = &fromFile__buf__;
***************
*** 421,431 ****
&mountFlags))
return NULL;
! _rv = FSResolveAliasWithMountFlags(fromFile,
! _self->ob_itself,
! &target,
! &wasChanged,
! mountFlags);
! _res = Py_BuildValue("hO&b",
! _rv,
FSRef_New, &target,
wasChanged);
--- 421,431 ----
&mountFlags))
return NULL;
! _err = FSResolveAliasWithMountFlags(fromFile,
! _self->ob_itself,
! &target,
! &wasChanged,
! mountFlags);
! if (_err != noErr) return PyMac_Error(_err);
! _res = Py_BuildValue("O&b",
FSRef_New, &target,
wasChanged);
***************
*** 436,440 ****
{
PyObject *_res = NULL;
! OSErr _rv;
FSRef fromFile__buf__;
FSRef *fromFile = &fromFile__buf__;
--- 436,440 ----
{
PyObject *_res = NULL;
! OSErr _err;
FSRef fromFile__buf__;
FSRef *fromFile = &fromFile__buf__;
***************
*** 444,453 ****
myPyMac_GetOptFSRefPtr, &fromFile))
return NULL;
! _rv = FSResolveAlias(fromFile,
! _self->ob_itself,
! &target,
! &wasChanged);
! _res = Py_BuildValue("hO&b",
! _rv,
FSRef_New, &target,
wasChanged);
--- 444,453 ----
myPyMac_GetOptFSRefPtr, &fromFile))
return NULL;
! _err = FSResolveAlias(fromFile,
! _self->ob_itself,
! &target,
! &wasChanged);
! if (_err != noErr) return PyMac_Error(_err);
! _res = Py_BuildValue("O&b",
FSRef_New, &target,
wasChanged);
***************
*** 458,462 ****
{
PyObject *_res = NULL;
! OSErr _rv;
FSRef fromFile;
Boolean logon;
--- 458,462 ----
{
PyObject *_res = NULL;
! OSErr _err;
FSRef fromFile;
Boolean logon;
***************
*** 466,476 ****
&logon))
return NULL;
! _rv = FSFollowFinderAlias(&fromFile,
! _self->ob_itself,
! logon,
! &target,
! &wasChanged);
! _res = Py_BuildValue("hO&O&b",
! _rv,
FSRef_New, &fromFile,
FSRef_New, &target,
--- 466,476 ----
&logon))
return NULL;
! _err = FSFollowFinderAlias(&fromFile,
! _self->ob_itself,
! logon,
! &target,
! &wasChanged);
! if (_err != noErr) return PyMac_Error(_err);
! _res = Py_BuildValue("O&O&b",
FSRef_New, &fromFile,
FSRef_New, &target,
***************
*** 481,497 ****
static PyMethodDef Alias_methods[] = {
{"ResolveAlias", (PyCFunction)Alias_ResolveAlias, 1,
! PyDoc_STR("(FSSpec fromFile) -> (OSErr _rv, FSSpec target, Boolean wasChanged)")},
{"GetAliasInfo", (PyCFunction)Alias_GetAliasInfo, 1,
PyDoc_STR("(AliasInfoType index) -> (Str63 theString)")},
{"ResolveAliasWithMountFlags", (PyCFunction)Alias_ResolveAliasWithMountFlags, 1,
! PyDoc_STR("(FSSpec fromFile, unsigned long mountFlags) -> (OSErr _rv, FSSpec target, Boolean wasChanged)")},
{"FollowFinderAlias", (PyCFunction)Alias_FollowFinderAlias, 1,
! PyDoc_STR("(FSSpec fromFile, Boolean logon) -> (OSErr _rv, FSSpec target, Boolean wasChanged)")},
{"FSResolveAliasWithMountFlags", (PyCFunction)Alias_FSResolveAliasWithMountFlags, 1,
! PyDoc_STR("(FSRef fromFile, unsigned long mountFlags) -> (OSErr _rv, FSRef target, Boolean wasChanged)")},
{"FSResolveAlias", (PyCFunction)Alias_FSResolveAlias, 1,
! PyDoc_STR("(FSRef fromFile) -> (OSErr _rv, FSRef target, Boolean wasChanged)")},
{"FSFollowFinderAlias", (PyCFunction)Alias_FSFollowFinderAlias, 1,
! PyDoc_STR("(Boolean logon) -> (OSErr _rv, FSRef fromFile, FSRef target, Boolean wasChanged)")},
{NULL, NULL, 0}
};
--- 481,497 ----
static PyMethodDef Alias_methods[] = {
{"ResolveAlias", (PyCFunction)Alias_ResolveAlias, 1,
! PyDoc_STR("(FSSpec fromFile) -> (FSSpec target, Boolean wasChanged)")},
{"GetAliasInfo", (PyCFunction)Alias_GetAliasInfo, 1,
PyDoc_STR("(AliasInfoType index) -> (Str63 theString)")},
{"ResolveAliasWithMountFlags", (PyCFunction)Alias_ResolveAliasWithMountFlags, 1,
! PyDoc_STR("(FSSpec fromFile, unsigned long mountFlags) -> (FSSpec target, Boolean wasChanged)")},
{"FollowFinderAlias", (PyCFunction)Alias_FollowFinderAlias, 1,
! PyDoc_STR("(FSSpec fromFile, Boolean logon) -> (FSSpec target, Boolean wasChanged)")},
{"FSResolveAliasWithMountFlags", (PyCFunction)Alias_FSResolveAliasWithMountFlags, 1,
! PyDoc_STR("(FSRef fromFile, unsigned long mountFlags) -> (FSRef target, Boolean wasChanged)")},
{"FSResolveAlias", (PyCFunction)Alias_FSResolveAlias, 1,
! PyDoc_STR("(FSRef fromFile) -> (FSRef target, Boolean wasChanged)")},
{"FSFollowFinderAlias", (PyCFunction)Alias_FSFollowFinderAlias, 1,
! PyDoc_STR("(Boolean logon) -> (FSRef fromFile, FSRef target, Boolean wasChanged)")},
{NULL, NULL, 0}
};
Index: filesupport.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/file/filesupport.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** filesupport.py 25 Dec 2002 22:45:28 -0000 1.8
--- filesupport.py 26 Dec 2002 20:45:43 -0000 1.9
***************
*** 528,532 ****
# Alias methods come in two flavors: those with the alias as arg1 and
# those with the alias as arg 2.
! class Arg2MethodGenerator(MethodGenerator):
"""Similar to MethodGenerator, but has self as second argument"""
--- 528,532 ----
# Alias methods come in two flavors: those with the alias as arg1 and
# those with the alias as arg 2.
! class Arg2MethodGenerator(OSErrMethodGenerator):
"""Similar to MethodGenerator, but has self as second argument"""