[Python-checkins] cpython (merge 3.6 -> default): Merge 3.6

[victor.stinner]

https://hg.python.org/cpython/rev/245ee609feea
changeset:   104778:245ee609feea
parent:      104776:8059289b55c1
parent:      104777:fb7c439103b9
user:        Victor Stinner <victor.stinner at gmail.com>
date:        Fri Oct 28 19:15:08 2016 +0200
summary:
  Merge 3.6

files:
  Modules/_asynciomodule.c |  10 +++++-----
  1 files changed, 5 insertions(+), 5 deletions(-)


diff --git a/Modules/_asynciomodule.c b/Modules/_asynciomodule.c
--- a/Modules/_asynciomodule.c
+++ b/Modules/_asynciomodule.c
@@ -893,7 +893,7 @@
 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 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 @@
 };
 
 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 @@
 }
 
 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 PyTypeObject TaskType = {
-    PyVarObject_HEAD_INIT(0, 0)
+    PyVarObject_HEAD_INIT(NULL, 0)
     "_asyncio.Task",
     sizeof(TaskObj),                       /* tp_basicsize */
     .tp_base = &FutureType,

-- 
Repository URL: https://hg.python.org/cpython