summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2016-10-28 17:15:08 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2016-10-28 17:15:08 (GMT)
commit1e03d8cc1236083747ff374e68d2abc199fb942f (patch)
tree548a63cbea37c9094ea254a65b2dc48b90ad2b7d
parent29d3cbfe9786697960fb4ccf79276cf44158e7e7 (diff)
parent1aea8fb9e0ec6ac05d57e91a6be44a288589410c (diff)
downloadcpython-1e03d8cc1236083747ff374e68d2abc199fb942f.zip
cpython-1e03d8cc1236083747ff374e68d2abc199fb942f.tar.gz
cpython-1e03d8cc1236083747ff374e68d2abc199fb942f.tar.bz2
Merge 3.6
-rw-r--r--Modules/_asynciomodule.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/Modules/_asynciomodule.c b/Modules/_asynciomodule.c
index d9419df..f606923 100644
--- a/Modules/_asynciomodule.c
+++ b/Modules/_asynciomodule.c
@@ -893,7 +893,7 @@ static PyGetSetDef FutureType_getsetlist[] = {
static void FutureObj_dealloc(PyObject *self);
static PyTypeObject FutureType = {
- PyVarObject_HEAD_INIT(0, 0)
+ PyVarObject_HEAD_INIT(NULL, 0)
"_asyncio.Future",
sizeof(FutureObj), /* tp_basicsize */
.tp_dealloc = FutureObj_dealloc,
@@ -1092,7 +1092,7 @@ static PyMethodDef FutureIter_methods[] = {
};
static PyTypeObject FutureIterType = {
- PyVarObject_HEAD_INIT(0, 0)
+ PyVarObject_HEAD_INIT(NULL, 0)
"_asyncio.FutureIter",
.tp_basicsize = sizeof(futureiterobject),
.tp_itemsize = 0,
@@ -1189,7 +1189,7 @@ static PyGetSetDef TaskSendMethWrapper_getsetlist[] = {
};
PyTypeObject TaskSendMethWrapper_Type = {
- PyVarObject_HEAD_INIT(&PyType_Type, 0)
+ PyVarObject_HEAD_INIT(NULL, 0)
"TaskSendMethWrapper",
.tp_basicsize = sizeof(TaskSendMethWrapper),
.tp_itemsize = 0,
@@ -1260,7 +1260,7 @@ TaskWakeupMethWrapper_dealloc(TaskWakeupMethWrapper *o)
}
PyTypeObject TaskWakeupMethWrapper_Type = {
- PyVarObject_HEAD_INIT(&PyType_Type, 0)
+ PyVarObject_HEAD_INIT(NULL, 0)
"TaskWakeupMethWrapper",
.tp_basicsize = sizeof(TaskWakeupMethWrapper),
.tp_itemsize = 0,
@@ -1778,7 +1778,7 @@ static PyGetSetDef TaskType_getsetlist[] = {
};
static PyTypeObject TaskType = {
- PyVarObject_HEAD_INIT(0, 0)
+ PyVarObject_HEAD_INIT(NULL, 0)
"_asyncio.Task",
sizeof(TaskObj), /* tp_basicsize */
.tp_base = &FutureType,