[pypy-commit] pypy default: py3 compatibility: use PyVarObject_HEAD_INIT
rlamy
pypy.commits at gmail.com
Tue Oct 4 10:50:19 EDT 2016
Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch:
Changeset: r87568:94d38ec98ccf
Date: 2016-10-04 15:49 +0100
http://bitbucket.org/pypy/pypy/changeset/94d38ec98ccf/
Log: py3 compatibility: use PyVarObject_HEAD_INIT
diff --git a/pypy/module/cpyext/test/_sre.c b/pypy/module/cpyext/test/_sre.c
--- a/pypy/module/cpyext/test/_sre.c
+++ b/pypy/module/cpyext/test/_sre.c
@@ -2608,8 +2608,8 @@
};
statichere PyTypeObject Pattern_Type = {
- PyObject_HEAD_INIT(NULL)
- 0, "_" SRE_MODULE ".SRE_Pattern",
+ PyVarObject_HEAD_INIT(NULL, 0)
+ "_" SRE_MODULE ".SRE_Pattern",
sizeof(PatternObject), sizeof(SRE_CODE),
(destructor)pattern_dealloc, /*tp_dealloc*/
0, /* tp_print */
@@ -3794,8 +3794,8 @@
};
statichere PyTypeObject Scanner_Type = {
- PyObject_HEAD_INIT(NULL)
- 0, "_" SRE_MODULE ".SRE_Scanner",
+ PyVarObject_HEAD_INIT(NULL, 0)
+ "_" SRE_MODULE ".SRE_Scanner",
sizeof(ScannerObject), 0,
(destructor)scanner_dealloc, /*tp_dealloc*/
0, /* tp_print */
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_intobject.py b/pypy/module/cpyext/test/test_intobject.py
--- a/pypy/module/cpyext/test/test_intobject.py
+++ b/pypy/module/cpyext/test/test_intobject.py
@@ -120,8 +120,7 @@
};
PyTypeObject Enum_Type = {
- PyObject_HEAD_INIT(0)
- /*ob_size*/ 0,
+ PyVarObject_HEAD_INIT(NULL, 0)
/*tp_name*/ "Enum",
/*tp_basicsize*/ sizeof(EnumObject),
/*tp_itemsize*/ 0,
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
@@ -834,8 +834,7 @@
}
PyTypeObject IntLike_Type = {
- PyObject_HEAD_INIT(0)
- /*ob_size*/ 0,
+ PyVarObject_HEAD_INIT(NULL, 0)
/*tp_name*/ "IntLike",
/*tp_basicsize*/ sizeof(IntLikeObject),
};
@@ -930,8 +929,7 @@
}
PyTypeObject IntLike_Type = {
- PyObject_HEAD_INIT(0)
- /*ob_size*/ 0,
+ PyVarObject_HEAD_INIT(NULL, 0)
/*tp_name*/ "IntLike",
/*tp_basicsize*/ sizeof(IntLikeObject),
};
@@ -944,8 +942,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),
};
More information about the pypy-commit
mailing list