Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 248f6f1

Browse files
jackjansenjackjansen
committed
Second-argument alias methods were generated with a variation on
MethodGenerator, this should be OSErrMethodGenerator.
1 parent 9a40c1c commit 248f6f1

2 files changed

Lines changed: 53 additions & 53 deletions

File tree

‎Mac/Modules/file/_Filemodule.c‎

Lines changed: 52 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -320,20 +320,20 @@ static void Alias_dealloc(AliasObject *self)
320320
static PyObject *Alias_ResolveAlias(AliasObject *_self, PyObject *_args)
321321
{
322322
PyObject *_res = NULL;
323-
OSErr _rv;
323+
OSErr _err;
324324
FSSpec fromFile__buf__;
325325
FSSpec *fromFile = &fromFile__buf__;
326326
FSSpec target;
327327
Boolean wasChanged;
328328
if (!PyArg_ParseTuple(_args, "O&",
329329
myPyMac_GetOptFSSpecPtr, &fromFile))
330330
return NULL;
331-
_rv = ResolveAlias(fromFile,
332-
_self->ob_itself,
333-
&target,
334-
&wasChanged);
335-
_res = Py_BuildValue("hO&b",
336-
_rv,
331+
_err = ResolveAlias(fromFile,
332+
_self->ob_itself,
333+
&target,
334+
&wasChanged);
335+
if (_err != noErr) return PyMac_Error(_err);
336+
_res = Py_BuildValue("O&b",
337337
FSSpec_New, &target,
338338
wasChanged);
339339
return _res;
@@ -360,7 +360,7 @@ static PyObject *Alias_GetAliasInfo(AliasObject *_self, PyObject *_args)
360360
static PyObject *Alias_ResolveAliasWithMountFlags(AliasObject *_self, PyObject *_args)
361361
{
362362
PyObject *_res = NULL;
363-
OSErr _rv;
363+
OSErr _err;
364364
FSSpec fromFile__buf__;
365365
FSSpec *fromFile = &fromFile__buf__;
366366
FSSpec target;
@@ -370,13 +370,13 @@ static PyObject *Alias_ResolveAliasWithMountFlags(AliasObject *_self, PyObject *
370370
myPyMac_GetOptFSSpecPtr, &fromFile,
371371
&mountFlags))
372372
return NULL;
373-
_rv = ResolveAliasWithMountFlags(fromFile,
374-
_self->ob_itself,
375-
&target,
376-
&wasChanged,
377-
mountFlags);
378-
_res = Py_BuildValue("hO&b",
379-
_rv,
373+
_err = ResolveAliasWithMountFlags(fromFile,
374+
_self->ob_itself,
375+
&target,
376+
&wasChanged,
377+
mountFlags);
378+
if (_err != noErr) return PyMac_Error(_err);
379+
_res = Py_BuildValue("O&b",
380380
FSSpec_New, &target,
381381
wasChanged);
382382
return _res;
@@ -385,7 +385,7 @@ static PyObject *Alias_ResolveAliasWithMountFlags(AliasObject *_self, PyObject *
385385
static PyObject *Alias_FollowFinderAlias(AliasObject *_self, PyObject *_args)
386386
{
387387
PyObject *_res = NULL;
388-
OSErr _rv;
388+
OSErr _err;
389389
FSSpec fromFile__buf__;
390390
FSSpec *fromFile = &fromFile__buf__;
391391
Boolean logon;
@@ -395,13 +395,13 @@ static PyObject *Alias_FollowFinderAlias(AliasObject *_self, PyObject *_args)
395395
myPyMac_GetOptFSSpecPtr, &fromFile,
396396
&logon))
397397
return NULL;
398-
_rv = FollowFinderAlias(fromFile,
399-
_self->ob_itself,
400-
logon,
401-
&target,
402-
&wasChanged);
403-
_res = Py_BuildValue("hO&b",
404-
_rv,
398+
_err = FollowFinderAlias(fromFile,
399+
_self->ob_itself,
400+
logon,
401+
&target,
402+
&wasChanged);
403+
if (_err != noErr) return PyMac_Error(_err);
404+
_res = Py_BuildValue("O&b",
405405
FSSpec_New, &target,
406406
wasChanged);
407407
return _res;
@@ -410,7 +410,7 @@ static PyObject *Alias_FollowFinderAlias(AliasObject *_self, PyObject *_args)
410410
static PyObject *Alias_FSResolveAliasWithMountFlags(AliasObject *_self, PyObject *_args)
411411
{
412412
PyObject *_res = NULL;
413-
OSErr _rv;
413+
OSErr _err;
414414
FSRef fromFile__buf__;
415415
FSRef *fromFile = &fromFile__buf__;
416416
FSRef target;
@@ -420,13 +420,13 @@ static PyObject *Alias_FSResolveAliasWithMountFlags(AliasObject *_self, PyObject
420420
myPyMac_GetOptFSRefPtr, &fromFile,
421421
&mountFlags))
422422
return NULL;
423-
_rv = FSResolveAliasWithMountFlags(fromFile,
424-
_self->ob_itself,
425-
&target,
426-
&wasChanged,
427-
mountFlags);
428-
_res = Py_BuildValue("hO&b",
429-
_rv,
423+
_err = FSResolveAliasWithMountFlags(fromFile,
424+
_self->ob_itself,
425+
&target,
426+
&wasChanged,
427+
mountFlags);
428+
if (_err != noErr) return PyMac_Error(_err);
429+
_res = Py_BuildValue("O&b",
430430
FSRef_New, &target,
431431
wasChanged);
432432
return _res;
@@ -435,20 +435,20 @@ static PyObject *Alias_FSResolveAliasWithMountFlags(AliasObject *_self, PyObject
435435
static PyObject *Alias_FSResolveAlias(AliasObject *_self, PyObject *_args)
436436
{
437437
PyObject *_res = NULL;
438-
OSErr _rv;
438+
OSErr _err;
439439
FSRef fromFile__buf__;
440440
FSRef *fromFile = &fromFile__buf__;
441441
FSRef target;
442442
Boolean wasChanged;
443443
if (!PyArg_ParseTuple(_args, "O&",
444444
myPyMac_GetOptFSRefPtr, &fromFile))
445445
return NULL;
446-
_rv = FSResolveAlias(fromFile,
447-
_self->ob_itself,
448-
&target,
449-
&wasChanged);
450-
_res = Py_BuildValue("hO&b",
451-
_rv,
446+
_err = FSResolveAlias(fromFile,
447+
_self->ob_itself,
448+
&target,
449+
&wasChanged);
450+
if (_err != noErr) return PyMac_Error(_err);
451+
_res = Py_BuildValue("O&b",
452452
FSRef_New, &target,
453453
wasChanged);
454454
return _res;
@@ -457,21 +457,21 @@ static PyObject *Alias_FSResolveAlias(AliasObject *_self, PyObject *_args)
457457
static PyObject *Alias_FSFollowFinderAlias(AliasObject *_self, PyObject *_args)
458458
{
459459
PyObject *_res = NULL;
460-
OSErr _rv;
460+
OSErr _err;
461461
FSRef fromFile;
462462
Boolean logon;
463463
FSRef target;
464464
Boolean wasChanged;
465465
if (!PyArg_ParseTuple(_args, "b",
466466
&logon))
467467
return NULL;
468-
_rv = FSFollowFinderAlias(&fromFile,
469-
_self->ob_itself,
470-
logon,
471-
&target,
472-
&wasChanged);
473-
_res = Py_BuildValue("hO&O&b",
474-
_rv,
468+
_err = FSFollowFinderAlias(&fromFile,
469+
_self->ob_itself,
470+
logon,
471+
&target,
472+
&wasChanged);
473+
if (_err != noErr) return PyMac_Error(_err);
474+
_res = Py_BuildValue("O&O&b",
475475
FSRef_New, &fromFile,
476476
FSRef_New, &target,
477477
wasChanged);
@@ -480,19 +480,19 @@ static PyObject *Alias_FSFollowFinderAlias(AliasObject *_self, PyObject *_args)
480480

481481
static PyMethodDef Alias_methods[] = {
482482
{"ResolveAlias", (PyCFunction)Alias_ResolveAlias, 1,
483-
PyDoc_STR("(FSSpec fromFile) -> (OSErr _rv, FSSpec target, Boolean wasChanged)")},
483+
PyDoc_STR("(FSSpec fromFile) -> (FSSpec target, Boolean wasChanged)")},
484484
{"GetAliasInfo", (PyCFunction)Alias_GetAliasInfo, 1,
485485
PyDoc_STR("(AliasInfoType index) -> (Str63 theString)")},
486486
{"ResolveAliasWithMountFlags", (PyCFunction)Alias_ResolveAliasWithMountFlags, 1,
487-
PyDoc_STR("(FSSpec fromFile, unsigned long mountFlags) -> (OSErr _rv, FSSpec target, Boolean wasChanged)")},
487+
PyDoc_STR("(FSSpec fromFile, unsigned long mountFlags) -> (FSSpec target, Boolean wasChanged)")},
488488
{"FollowFinderAlias", (PyCFunction)Alias_FollowFinderAlias, 1,
489-
PyDoc_STR("(FSSpec fromFile, Boolean logon) -> (OSErr _rv, FSSpec target, Boolean wasChanged)")},
489+
PyDoc_STR("(FSSpec fromFile, Boolean logon) -> (FSSpec target, Boolean wasChanged)")},
490490
{"FSResolveAliasWithMountFlags", (PyCFunction)Alias_FSResolveAliasWithMountFlags, 1,
491-
PyDoc_STR("(FSRef fromFile, unsigned long mountFlags) -> (OSErr _rv, FSRef target, Boolean wasChanged)")},
491+
PyDoc_STR("(FSRef fromFile, unsigned long mountFlags) -> (FSRef target, Boolean wasChanged)")},
492492
{"FSResolveAlias", (PyCFunction)Alias_FSResolveAlias, 1,
493-
PyDoc_STR("(FSRef fromFile) -> (OSErr _rv, FSRef target, Boolean wasChanged)")},
493+
PyDoc_STR("(FSRef fromFile) -> (FSRef target, Boolean wasChanged)")},
494494
{"FSFollowFinderAlias", (PyCFunction)Alias_FSFollowFinderAlias, 1,
495-
PyDoc_STR("(Boolean logon) -> (OSErr _rv, FSRef fromFile, FSRef target, Boolean wasChanged)")},
495+
PyDoc_STR("(Boolean logon) -> (FSRef fromFile, FSRef target, Boolean wasChanged)")},
496496
{NULL, NULL, 0}
497497
};
498498

‎Mac/Modules/file/filesupport.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -527,7 +527,7 @@ def output_tp_initBody(self):
527527

528528
# Alias methods come in two flavors: those with the alias as arg1 and
529529
# those with the alias as arg 2.
530-
class Arg2MethodGenerator(MethodGenerator):
530+
class Arg2MethodGenerator(OSErrMethodGenerator):
531531
"""Similar to MethodGenerator, but has self as second argument"""
532532

533533
def parseArgumentList(self, args):

0 commit comments

Comments
 (0)