Author: Carl Friedrich Bolz <[email protected]>
Branch: py3k
Changeset: r87587:24d05575caeb
Date: 2016-10-05 10:42 +0200
http://bitbucket.org/pypy/pypy/changeset/24d05575caeb/
Log: merge
diff --git a/pypy/module/cpyext/test/foo.c b/pypy/module/cpyext/test/foo.c
--- a/pypy/module/cpyext/test/foo.c
+++ b/pypy/module/cpyext/test/foo.c
@@ -259,8 +259,7 @@
};
PyTypeObject UnicodeSubtype = {
- PyObject_HEAD_INIT(NULL)
- 0,
+ PyVarObject_HEAD_INIT(NULL, 0)
"foo.fuu",
sizeof(UnicodeSubclassObject),
0,
@@ -318,8 +317,7 @@
};
PyTypeObject UnicodeSubtype2 = {
- PyObject_HEAD_INIT(NULL)
- 0,
+ PyVarObject_HEAD_INIT(NULL, 0)
"foo.fuu2",
sizeof(UnicodeSubclassObject),
0,
@@ -377,8 +375,7 @@
};
PyTypeObject UnicodeSubtype3 = {
- PyObject_HEAD_INIT(NULL)
- 0,
+ PyVarObject_HEAD_INIT(NULL, 0)
"foo.fuu3",
sizeof(UnicodeSubclassObject)
};
@@ -386,8 +383,7 @@
/* A Metatype */
PyTypeObject MetaType = {
- PyObject_HEAD_INIT(NULL)
- 0,
+ PyVarObject_HEAD_INIT(NULL, 0)
"foo.Meta",
sizeof(PyHeapTypeObject),/*tp_basicsize*/
0, /*tp_itemsize*/
@@ -466,8 +462,7 @@
PyTypeObject InitErrType = {
- PyObject_HEAD_INIT(NULL)
- 0,
+ PyVarObject_HEAD_INIT(NULL, 0)
"foo.InitErrType",
sizeof(PyObject),/*tp_basicsize*/
0, /*tp_itemsize*/
@@ -550,8 +545,7 @@
PyTypeObject SimplePropertyType = {
- PyObject_HEAD_INIT(NULL)
- 0,
+ PyVarObject_HEAD_INIT(NULL, 0)
"foo.Property",
sizeof(PyObject),
0,
@@ -625,8 +619,7 @@
}
static PyTypeObject CustomType = {
- PyObject_HEAD_INIT(NULL)
- 0,
+ PyVarObject_HEAD_INIT(NULL, 0)
"foo.Custom", /*tp_name*/
sizeof(PyObject), /*tp_size*/
0, /*tp_itemsize*/
@@ -635,8 +628,7 @@
};
static PyTypeObject TupleLike = {
- PyObject_HEAD_INIT(NULL)
- 0,
+ PyVarObject_HEAD_INIT(NULL, 0)
"foo.TupleLike", /*tp_name*/
sizeof(PyObject), /*tp_size*/
};
diff --git a/pypy/module/cpyext/test/test_typeobject.py
b/pypy/module/cpyext/test/test_typeobject.py
--- a/pypy/module/cpyext/test/test_typeobject.py
+++ b/pypy/module/cpyext/test/test_typeobject.py
@@ -817,8 +817,7 @@
}
PyTypeObject IntLike_Type = {
- PyObject_HEAD_INIT(0)
- /*ob_size*/ 0,
+ PyVarObject_HEAD_INIT(NULL, 0)
/*tp_name*/ "IntLike",
/*tp_basicsize*/ sizeof(IntLikeObject),
};
@@ -913,8 +912,7 @@
}
PyTypeObject IntLike_Type = {
- PyObject_HEAD_INIT(0)
- /*ob_size*/ 0,
+ PyVarObject_HEAD_INIT(NULL, 0)
/*tp_name*/ "IntLike",
/*tp_basicsize*/ sizeof(IntLikeObject),
};
@@ -927,8 +925,7 @@
} IntLikeObjectNoOp;
PyTypeObject IntLike_Type_NoOp = {
- PyObject_HEAD_INIT(0)
- /*ob_size*/ 0,
+ PyVarObject_HEAD_INIT(NULL, 0)
/*tp_name*/ "IntLikeNoOp",
/*tp_basicsize*/ sizeof(IntLikeObjectNoOp),
};
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
