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

[yury.selivanov]

https://hg.python.org/cpython/rev/f86ad978e482
changeset:   104997:f86ad978e482
branch:      3.6
parent:      104994:0943453c0210
parent:      104996:4377f414f4a5
user:        Yury Selivanov <yury at magic.io>
date:        Tue Nov 08 19:19:52 2016 -0500
summary:
  Merge 3.5

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