diff options
Diffstat (limited to 'Mac/Modules/cg')
-rwxr-xr-x | Mac/Modules/cg/_CGmodule.c | 30 | ||||
-rwxr-xr-x | Mac/Modules/cg/cgsupport.py | 2 |
2 files changed, 21 insertions, 11 deletions
diff --git a/Mac/Modules/cg/_CGmodule.c b/Mac/Modules/cg/_CGmodule.c index 069889a..b475d68 100755 --- a/Mac/Modules/cg/_CGmodule.c +++ b/Mac/Modules/cg/_CGmodule.c @@ -1266,14 +1266,7 @@ static PyMethodDef CGContextRefObj_methods[] = { {NULL, NULL, 0} }; -PyMethodChain CGContextRefObj_chain = { CGContextRefObj_methods, NULL }; - -static PyObject *CGContextRefObj_getattr(CGContextRefObject *self, char *name) -{ - return Py_FindMethodInChain(&CGContextRefObj_chain, (PyObject *)self, name); -} - -#define CGContextRefObj_setattr NULL +#define CGContextRefObj_getsetlist NULL #define CGContextRefObj_compare NULL @@ -1290,14 +1283,31 @@ PyTypeObject CGContextRef_Type = { /* methods */ (destructor) CGContextRefObj_dealloc, /*tp_dealloc*/ 0, /*tp_print*/ - (getattrfunc) CGContextRefObj_getattr, /*tp_getattr*/ - (setattrfunc) CGContextRefObj_setattr, /*tp_setattr*/ + (getattrfunc)0, /*tp_getattr*/ + (setattrfunc)0, /*tp_setattr*/ (cmpfunc) CGContextRefObj_compare, /*tp_compare*/ (reprfunc) CGContextRefObj_repr, /*tp_repr*/ (PyNumberMethods *)0, /* tp_as_number */ (PySequenceMethods *)0, /* tp_as_sequence */ (PyMappingMethods *)0, /* tp_as_mapping */ (hashfunc) CGContextRefObj_hash, /*tp_hash*/ + 0, /*tp_call*/ + 0, /*tp_str*/ + PyObject_GenericGetAttr, /*tp_getattro*/ + PyObject_GenericSetAttr, /*tp_setattro */ + 0, /*outputHook_tp_as_buffer*/ + 0, /*outputHook_tp_flags*/ + 0, /*outputHook_tp_doc*/ + 0, /*outputHook_tp_traverse*/ + 0, /*outputHook_tp_clear*/ + 0, /*outputHook_tp_richcompare*/ + 0, /*outputHook_tp_weaklistoffset*/ + 0, /*outputHook_tp_iter*/ + 0, /*outputHook_tp_iternext*/ + CGContextRefObj_methods, /* tp_methods */ + 0, /*outputHook_tp_members*/ + CGContextRefObj_getsetlist, /*tp_getset*/ + 0, /*outputHook_tp_base*/ }; /* ------------------ End object type CGContextRef ------------------ */ diff --git a/Mac/Modules/cg/cgsupport.py b/Mac/Modules/cg/cgsupport.py index d090685..ca347f7 100755 --- a/Mac/Modules/cg/cgsupport.py +++ b/Mac/Modules/cg/cgsupport.py @@ -250,7 +250,7 @@ CGPathDrawingMode = int CGContextRef = OpaqueByValueType("CGContextRef", "CGContextRefObj") -class MyObjectDefinition(GlobalObjectDefinition): +class MyObjectDefinition(PEP252Mixin, GlobalObjectDefinition): def outputStructMembers(self): ObjectDefinition.outputStructMembers(self) def outputCleanupStructMembers(self): |