mirror of
https://github.com/python/cpython.git
synced 2025-08-04 17:08:35 +00:00
Added PEP253 support to most Carbon modules. This isn't complete yet:
some of the more compilcated cases (CF, Res) haven't been done yet. Also, various types should inherit from each other (anything with an as_Resource method should be a Resource subtype, the CF types should become one family).
This commit is contained in:
parent
99899b92b8
commit
96cebde909
43 changed files with 1592 additions and 534 deletions
|
@ -869,6 +869,24 @@ static PyGetSetDef AEDesc_getsetlist[] = {
|
|||
#define AEDesc_repr NULL
|
||||
|
||||
#define AEDesc_hash NULL
|
||||
#define AEDesc_tp_init 0
|
||||
|
||||
#define AEDesc_tp_alloc PyType_GenericAlloc
|
||||
|
||||
static PyObject *AEDesc_tp_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
|
||||
{
|
||||
PyObject *self;
|
||||
AEDesc itself;
|
||||
char *kw[] = {"itself", 0};
|
||||
|
||||
if (!PyArg_ParseTupleAndKeywords(args, kwds, "O&", kw, AEDesc_Convert, &itself)) return NULL;
|
||||
if ((self = type->tp_alloc(type, 0)) == NULL) return NULL;
|
||||
((AEDescObject *)self)->ob_itself = itself;
|
||||
return self;
|
||||
}
|
||||
|
||||
#define AEDesc_tp_free PyObject_Del
|
||||
|
||||
|
||||
PyTypeObject AEDesc_Type = {
|
||||
PyObject_HEAD_INIT(NULL)
|
||||
|
@ -891,19 +909,27 @@ PyTypeObject AEDesc_Type = {
|
|||
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*/
|
||||
0, /*tp_as_buffer*/
|
||||
Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE, /* tp_flags */
|
||||
0, /*tp_doc*/
|
||||
0, /*tp_traverse*/
|
||||
0, /*tp_clear*/
|
||||
0, /*tp_richcompare*/
|
||||
0, /*tp_weaklistoffset*/
|
||||
0, /*tp_iter*/
|
||||
0, /*tp_iternext*/
|
||||
AEDesc_methods, /* tp_methods */
|
||||
0, /*outputHook_tp_members*/
|
||||
0, /*tp_members*/
|
||||
AEDesc_getsetlist, /*tp_getset*/
|
||||
0, /*outputHook_tp_base*/
|
||||
0, /*tp_base*/
|
||||
0, /*tp_dict*/
|
||||
0, /*tp_descr_get*/
|
||||
0, /*tp_descr_set*/
|
||||
0, /*tp_dictoffset*/
|
||||
AEDesc_tp_init, /* tp_init */
|
||||
AEDesc_tp_alloc, /* tp_alloc */
|
||||
AEDesc_tp_new, /* tp_new */
|
||||
AEDesc_tp_free, /* tp_free */
|
||||
};
|
||||
|
||||
/* --------------------- End object type AEDesc --------------------- */
|
||||
|
@ -1429,8 +1455,10 @@ void init_AE(void)
|
|||
return;
|
||||
AEDesc_Type.ob_type = &PyType_Type;
|
||||
Py_INCREF(&AEDesc_Type);
|
||||
if (PyDict_SetItemString(d, "AEDescType", (PyObject *)&AEDesc_Type) != 0)
|
||||
Py_FatalError("can't initialize AEDescType");
|
||||
PyModule_AddObject(m, "AEDesc", (PyObject *)&AEDesc_Type);
|
||||
/* Backward-compatible name */
|
||||
Py_INCREF(&AEDesc_Type);
|
||||
PyModule_AddObject(m, "AEDescType", (PyObject *)&AEDesc_Type);
|
||||
}
|
||||
|
||||
/* ========================= End module _AE ========================= */
|
||||
|
|
|
@ -174,7 +174,7 @@ initstuff = initstuff + """
|
|||
|
||||
module = MacModule('_AE', 'AE', includestuff, finalstuff, initstuff)
|
||||
|
||||
class AEDescDefinition(PEP252Mixin, GlobalObjectDefinition):
|
||||
class AEDescDefinition(PEP253Mixin, GlobalObjectDefinition):
|
||||
getsetlist = [(
|
||||
'type',
|
||||
'return PyMac_BuildOSType(self->ob_itself.descriptorType);',
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue