mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 10:19:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Converted the Carbon modules to use PEP252-style objects, with

Browse source 
descriptors in stead of manual getattr hooks to get at attributes
of the objects.

For Qd I have in stead gotten rid of most of the attribute access
in favor of the carbon-style accessor methods (with the exception
of visRgn, to be done later), and of the Carbon.Qd.qd global object,
for which accessor functions are also available.

For List I have fixed the fact that various methods were incorrectly
generated as functions.

CF is untouched: PEP252 doesn't allow "poor-mans-inheritance" with
basechain, so it will have to wait for PEP253 support.
This commit is contained in:
Jack Jansen 2002-11-29 23:40:48 +00:00
parent 818855939a
commit dbd5701d73
48 changed files with 2447 additions and 2507 deletions
Download patch file Download diff file Expand all files Collapse all files

58
Mac/Modules/list/listsupport.py
View file

@ -137,41 +137,23 @@ class ListMethodGenerator(MethodGenerator):
FunctionGenerator.parseArgumentList(self, args)
self.argumentList.append(self.itself)
getattrHookCode = """{
if ( strcmp(name, "listFlags") == 0 )
return Py_BuildValue("l", (long)GetListFlags(self->ob_itself) & 0xff);
if ( strcmp(name, "selFlags") == 0 )
return Py_BuildValue("l", (long)GetListSelectionFlags(self->ob_itself) & 0xff);
if ( strcmp(name, "cellSize") == 0 )
return Py_BuildValue("O&", PyMac_BuildPoint, (*self->ob_itself)->cellSize);
}"""
setattrCode = """
static int
ListObj_setattr(ListObject *self, char *name, PyObject *value)
{
long intval;
int err = 0;
if ( value == NULL ) {
PyErr_SetString(PyExc_AttributeError, "Cannot delete attribute");
return -1;
}
if (strcmp(name, "listFlags") == 0 )
err = PyArg_Parse(value, "B", &(*self->ob_itself)->listFlags);
else if (strcmp(name, "selFlags") == 0 )
err = PyArg_Parse(value, "B", &(*self->ob_itself)->selFlags);
else if (strcmp(name, "cellSize") == 0 )
err = PyArg_Parse(value, "O&", PyMac_GetPoint, &(*self->ob_itself)->cellSize);
else
PyErr_SetString(PyExc_AttributeError, "No such attribute");
if (err) return 0;
else return -1;
}
"""
class MyObjectDefinition(GlobalObjectDefinition):
class MyObjectDefinition(PEP252Mixin, GlobalObjectDefinition):
getsetlist = [(
'listFlags',
'return Py_BuildValue("l", (long)GetListFlags(self->ob_itself) & 0xff);',
'if (!PyArg_Parse(v, "B", &(*self->ob_itself)->listFlags)) return -1;',
None,
), (
'selFlags',
'return Py_BuildValue("l", (long)GetListSelectionFlags(self->ob_itself) & 0xff);',
'if (!PyArg_Parse(v, "B", &(*self->ob_itself)->selFlags)) return -1;',
None,
), (
'cellSize',
'return Py_BuildValue("O&", PyMac_BuildPoint, (*self->ob_itself)->cellSize);',
'if (!PyArg_Parse(v, "O&", PyMac_GetPoint, &(*self->ob_itself)->cellSize)) return -1;',
None
)]
def outputStructMembers(self):
ObjectDefinition.outputStructMembers(self)
@ -201,12 +183,6 @@ class MyObjectDefinition(GlobalObjectDefinition):
Output("SetListRefCon(self->ob_itself, (long)0);")
Output("if (self->ob_must_be_disposed && %s) LDispose(%s);", itselfname, itselfname)
def outputGetattrHook(self):
Output(getattrHookCode)
def outputSetattr(self):
Output(setattrCode)
# From here on it's basically all boiler plate...
finalstuff = finalstuff + """