diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2007-07-22 14:41:55 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2007-07-22 14:41:55 (GMT) |
| commit | 95c95ce5be8cf87e0e95ef285664aabda7ddd170 (patch) | |
| tree | 154ee47a643efbe4c628b196e2e2dce88f61ecf6 /Mac/Modules/qd | |
| parent | 5d7428b8ce0ffc79b24b05df2b3d2865db037902 (diff) | |
| download | cpython-95c95ce5be8cf87e0e95ef285664aabda7ddd170.zip cpython-95c95ce5be8cf87e0e95ef285664aabda7ddd170.tar.gz cpython-95c95ce5be8cf87e0e95ef285664aabda7ddd170.tar.bz2 | |
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/qd')
| -rw-r--r-- | Mac/Modules/qd/_Qdmodule.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/Mac/Modules/qd/_Qdmodule.c b/Mac/Modules/qd/_Qdmodule.c index bfb040f..1e4c700 100644 --- a/Mac/Modules/qd/_Qdmodule.c +++ b/Mac/Modules/qd/_Qdmodule.c @@ -73,7 +73,7 @@ static PyObject *Qd_Error; PyTypeObject GrafPort_Type; -#define GrafObj_Check(x) ((x)->ob_type == &GrafPort_Type || PyObject_TypeCheck((x), &GrafPort_Type)) +#define GrafObj_Check(x) (Py_Type(x) == &GrafPort_Type || PyObject_TypeCheck((x), &GrafPort_Type)) typedef struct GrafPortObject { PyObject_HEAD @@ -125,7 +125,7 @@ int GrafObj_Convert(PyObject *v, GrafPtr *p_itself) static void GrafObj_dealloc(GrafPortObject *self) { /* Cleanup of self->ob_itself goes here */ - self->ob_type->tp_free((PyObject *)self); + Py_Type(self)->tp_free((PyObject *)self); } static PyObject *GrafObj_MacSetPort(GrafPortObject *_self, PyObject *_args) @@ -1358,8 +1358,7 @@ static PyObject *GrafObj_tp_new(PyTypeObject *type, PyObject *_args, PyObject *_ PyTypeObject GrafPort_Type = { - PyObject_HEAD_INIT(NULL) - 0, /*ob_size*/ + PyVarObject_HEAD_INIT(NULL, 0) "_Qd.GrafPort", /*tp_name*/ sizeof(GrafPortObject), /*tp_basicsize*/ 0, /*tp_itemsize*/ @@ -1408,7 +1407,7 @@ PyTypeObject GrafPort_Type = { PyTypeObject BitMap_Type; -#define BMObj_Check(x) ((x)->ob_type == &BitMap_Type || PyObject_TypeCheck((x), &BitMap_Type)) +#define BMObj_Check(x) (Py_Type(x) == &BitMap_Type || PyObject_TypeCheck((x), &BitMap_Type)) typedef struct BitMapObject { PyObject_HEAD @@ -1444,7 +1443,7 @@ static void BMObj_dealloc(BitMapObject *self) { Py_XDECREF(self->referred_object); if (self->referred_bitmap) free(self->referred_bitmap); - self->ob_type->tp_free((PyObject *)self); + Py_Type(self)->tp_free((PyObject *)self); } static PyObject *BMObj_getdata(BitMapObject *_self, PyObject *_args) @@ -1557,8 +1556,7 @@ static PyObject *BMObj_tp_new(PyTypeObject *type, PyObject *_args, PyObject *_kw PyTypeObject BitMap_Type = { - PyObject_HEAD_INIT(NULL) - 0, /*ob_size*/ + PyVarObject_HEAD_INIT(NULL, 0) "_Qd.BitMap", /*tp_name*/ sizeof(BitMapObject), /*tp_basicsize*/ 0, /*tp_itemsize*/ @@ -7124,14 +7122,14 @@ void init_Qd(void) if (Qd_Error == NULL || PyDict_SetItemString(d, "Error", Qd_Error) != 0) return; - GrafPort_Type.ob_type = &PyType_Type; + Py_Type(&GrafPort_Type) = &PyType_Type; if (PyType_Ready(&GrafPort_Type) < 0) return; Py_INCREF(&GrafPort_Type); PyModule_AddObject(m, "GrafPort", (PyObject *)&GrafPort_Type); /* Backward-compatible name */ Py_INCREF(&GrafPort_Type); PyModule_AddObject(m, "GrafPortType", (PyObject *)&GrafPort_Type); - BitMap_Type.ob_type = &PyType_Type; + Py_Type(&BitMap_Type) = &PyType_Type; if (PyType_Ready(&BitMap_Type) < 0) return; Py_INCREF(&BitMap_Type); PyModule_AddObject(m, "BitMap", (PyObject *)&BitMap_Type); |