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/win | |
| 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/win')
| -rw-r--r-- | Mac/Modules/win/_Winmodule.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Mac/Modules/win/_Winmodule.c b/Mac/Modules/win/_Winmodule.c index 3841775..ae86468 100644 --- a/Mac/Modules/win/_Winmodule.c +++ b/Mac/Modules/win/_Winmodule.c @@ -45,7 +45,7 @@ static PyObject *Win_Error; PyTypeObject Window_Type; -#define WinObj_Check(x) ((x)->ob_type == &Window_Type || PyObject_TypeCheck((x), &Window_Type)) +#define WinObj_Check(x) (Py_Type(x) == &Window_Type || PyObject_TypeCheck((x), &Window_Type)) typedef struct WindowObject { PyObject_HEAD @@ -102,7 +102,7 @@ static void WinObj_dealloc(WindowObject *self) } self->ob_itself = NULL; self->ob_freeit = NULL; - self->ob_type->tp_free((PyObject *)self); + Py_Type(self)->tp_free((PyObject *)self); } static PyObject *WinObj_GetWindowOwnerCount(WindowObject *_self, PyObject *_args) @@ -2607,8 +2607,7 @@ static PyObject *WinObj_tp_new(PyTypeObject *type, PyObject *_args, PyObject *_k PyTypeObject Window_Type = { - PyObject_HEAD_INIT(NULL) - 0, /*ob_size*/ + PyVarObject_HEAD_INIT(NULL, 0) "_Win.Window", /*tp_name*/ sizeof(WindowObject), /*tp_basicsize*/ 0, /*tp_itemsize*/ @@ -3245,7 +3244,7 @@ void init_Win(void) if (Win_Error == NULL || PyDict_SetItemString(d, "Error", Win_Error) != 0) return; - Window_Type.ob_type = &PyType_Type; + Py_Type(&Window_Type) = &PyType_Type; if (PyType_Ready(&Window_Type) < 0) return; Py_INCREF(&Window_Type); PyModule_AddObject(m, "Window", (PyObject *)&Window_Type); |