summaryrefslogtreecommitdiffstats
path: root/Mac/Modules/list
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2007-07-22 14:41:55 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2007-07-22 14:41:55 (GMT)
commit95c95ce5be8cf87e0e95ef285664aabda7ddd170 (patch)
tree154ee47a643efbe4c628b196e2e2dce88f61ecf6 /Mac/Modules/list
parent5d7428b8ce0ffc79b24b05df2b3d2865db037902 (diff)
downloadcpython-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/list')
-rw-r--r--Mac/Modules/list/_Listmodule.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/Mac/Modules/list/_Listmodule.c b/Mac/Modules/list/_Listmodule.c
index 21a7f02..aa13490 100644
--- a/Mac/Modules/list/_Listmodule.c
+++ b/Mac/Modules/list/_Listmodule.c
@@ -37,7 +37,7 @@ static PyObject *List_Error;
PyTypeObject List_Type;
-#define ListObj_Check(x) ((x)->ob_type == &List_Type || PyObject_TypeCheck((x), &List_Type))
+#define ListObj_Check(x) (Py_Type(x) == &List_Type || PyObject_TypeCheck((x), &List_Type))
typedef struct ListObject {
PyObject_HEAD
@@ -79,7 +79,7 @@ static void ListObj_dealloc(ListObject *self)
self->ob_ldef_func = NULL;
SetListRefCon(self->ob_itself, (long)0);
if (self->ob_must_be_disposed && self->ob_itself) LDispose(self->ob_itself);
- self->ob_type->tp_free((PyObject *)self);
+ Py_Type(self)->tp_free((PyObject *)self);
}
static PyObject *ListObj_LAddColumn(ListObject *_self, PyObject *_args)
@@ -755,8 +755,7 @@ static PyObject *ListObj_tp_new(PyTypeObject *type, PyObject *_args, PyObject *_
PyTypeObject List_Type = {
- PyObject_HEAD_INIT(NULL)
- 0, /*ob_size*/
+ PyVarObject_HEAD_INIT(NULL, 0)
"_List.List", /*tp_name*/
sizeof(ListObject), /*tp_basicsize*/
0, /*tp_itemsize*/
@@ -1117,7 +1116,7 @@ void init_List(void)
if (List_Error == NULL ||
PyDict_SetItemString(d, "Error", List_Error) != 0)
return;
- List_Type.ob_type = &PyType_Type;
+ Py_Type(&List_Type) = &PyType_Type;
if (PyType_Ready(&List_Type) < 0) return;
Py_INCREF(&List_Type);
PyModule_AddObject(m, "List", (PyObject *)&List_Type);