make the NULL-instead-of-None change in tp_clear() optional and off by default - breaks too much code for now

1 files changed, 15 insertions, 2 deletions

diff --git a/Cython/Compiler/ModuleNode.py b/Cython/Compiler/ModuleNode.py
index d1cc241fb..d4a983389 100644
--- a/Cython/Compiler/ModuleNode.py
+++ b/Cython/Compiler/ModuleNode.py
@@ -1366,6 +1366,9 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode):
         code.putln("")
         code.putln("static int %s(%sPyObject *o) {" % (slot_func, unused))
 
+        if py_attrs and Options.clear_to_none:
+            code.putln("PyObject* tmp;")
+
         if py_attrs or py_buffers:
             self.generate_self_cast(scope, code)
 
@@ -1389,8 +1392,18 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode):
                 code.globalstate.use_utility_code(
                     UtilityCode.load_cached("CallNextTpClear", "ExtensionTypes.c"))
 
-        for entry in py_attrs:
-            code.putln("Py_CLEAR(p->%s);" % entry.cname)
+        if Options.clear_to_none:
+            for entry in py_attrs:
+                name = "p->%s" % entry.cname
+                code.putln("tmp = ((PyObject*)%s);" % name)
+                if entry.is_declared_generic:
+                    code.put_init_to_py_none(name, py_object_type, nanny=False)
+                else:
+                    code.put_init_to_py_none(name, entry.type, nanny=False)
+                code.putln("Py_XDECREF(tmp);")
+        else:
+            for entry in py_attrs:
+                code.putln("Py_CLEAR(p->%s);" % entry.cname)
 
         for entry in py_buffers:
             # Note: shouldn't this call __Pyx_ReleaseBuffer ??