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

[yury.selivanov]

https://hg.python.org/cpython/rev/88f0be352cb8
changeset:   104998:88f0be352cb8
parent:      104995:8e472e85fa5e
parent:      104997:f86ad978e482
user:        Yury Selivanov <yury at magic.io>
date:        Tue Nov 08 19:20:08 2016 -0500
summary:
  Merge 3.6

files:
  Objects/genobject.c |  4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Objects/genobject.c b/Objects/genobject.c
--- a/Objects/genobject.c
+++ b/Objects/genobject.c
@@ -1123,7 +1123,7 @@
     0,                                          /* tp_init */
     0,                                          /* tp_alloc */
     0,                                          /* tp_new */
-    PyObject_Del,                               /* tp_free */
+    0,                                          /* tp_free */
 };
 
 PyObject *
@@ -1208,7 +1208,7 @@
     0,                                          /* tp_init */
     0,                                          /* tp_alloc */
     0,                                          /* tp_new */
-    PyObject_Del,                               /* tp_free */
+    0,                                          /* tp_free */
 };
 
 

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