diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2007-07-22 14:41:55 +0000 |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2007-07-22 14:41:55 +0000 |
| commit | 95c95ce5be8cf87e0e95ef285664aabda7ddd170 (patch) | |
| tree | 154ee47a643efbe4c628b196e2e2dce88f61ecf6 /Mac/Modules/ae | |
| parent | 5d7428b8ce0ffc79b24b05df2b3d2865db037902 (diff) | |
| download | cpython-git-95c95ce5be8cf87e0e95ef285664aabda7ddd170.tar.gz | |
Merged revisions 56483-56491 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/p3yk
........
r56486 | kurt.kaiser | 2007-07-22 05:27:08 +0200 (So, 22 Jul 2007) | 2 lines
Fix typo introduced at r55797
........
r56487 | kurt.kaiser | 2007-07-22 07:48:45 +0200 (So, 22 Jul 2007) | 2 lines
Exception attr accessed via args in py3k.
........
r56489 | martin.v.loewis | 2007-07-22 15:32:44 +0200 (So, 22 Jul 2007) | 2 lines
Regenerate.
........
r56490 | martin.v.loewis | 2007-07-22 15:34:06 +0200 (So, 22 Jul 2007) | 2 lines
Port Mac modules to PEP 3123.
........
r56491 | martin.v.loewis | 2007-07-22 16:35:53 +0200 (So, 22 Jul 2007) | 1 line
Port to PEP 3123.
........
Diffstat (limited to 'Mac/Modules/ae')
| -rw-r--r-- | Mac/Modules/ae/_AEmodule.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Mac/Modules/ae/_AEmodule.c b/Mac/Modules/ae/_AEmodule.c index fd6ebccdb2..de7c25eaf3 100644 --- a/Mac/Modules/ae/_AEmodule.c +++ b/Mac/Modules/ae/_AEmodule.c @@ -47,7 +47,7 @@ static PyObject *AE_Error; PyTypeObject AEDesc_Type; -#define AEDesc_Check(x) ((x)->ob_type == &AEDesc_Type || PyObject_TypeCheck((x), &AEDesc_Type)) +#define AEDesc_Check(x) (Py_Type(x) == &AEDesc_Type || PyObject_TypeCheck((x), &AEDesc_Type)) typedef struct AEDescObject { PyObject_HEAD @@ -79,7 +79,7 @@ int AEDesc_Convert(PyObject *v, AEDesc *p_itself) static void AEDesc_dealloc(AEDescObject *self) { if (self->ob_owned) AEDisposeDesc(&self->ob_itself); - self->ob_type->tp_free((PyObject *)self); + Py_Type(self)->tp_free((PyObject *)self); } static PyObject *AEDesc_AECoerceDesc(AEDescObject *_self, PyObject *_args) @@ -878,8 +878,7 @@ static PyObject *AEDesc_tp_new(PyTypeObject *type, PyObject *_args, PyObject *_k PyTypeObject AEDesc_Type = { - PyObject_HEAD_INIT(NULL) - 0, /*ob_size*/ + PyVarObject_HEAD_INIT(NULL, 0) "_AE.AEDesc", /*tp_name*/ sizeof(AEDescObject), /*tp_basicsize*/ 0, /*tp_itemsize*/ @@ -1441,7 +1440,7 @@ void init_AE(void) if (AE_Error == NULL || PyDict_SetItemString(d, "Error", AE_Error) != 0) return; - AEDesc_Type.ob_type = &PyType_Type; + Py_Type(&AEDesc_Type) = &PyType_Type; if (PyType_Ready(&AEDesc_Type) < 0) return; Py_INCREF(&AEDesc_Type); PyModule_AddObject(m, "AEDesc", (PyObject *)&AEDesc_Type); |