From: William Stein <wstein@gmail.com>
Date: Mon, 18 Dec 2006 02:59:29 +0000 (-0800)
Subject: Peter Johnson (peter@tortall.net) weakref patch
X-Git-Tag: 0.9.6.14~29^2~204
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=061558c757d2786256d3606e1a9563d77799a5fc;p=cython.git

Peter Johnson (peter@tortall.net) weakref patch

I recently ran into this problem myself (as the current code causes
Python to crash), so I whipped up a quick patch that fixes it for me.
I think it follows all of the weakref guidelines now.

The patch is against the LXML svn pyrex
(http://codespeak.net/svn/lxml/pyrex/).  Is there a different SVN I
should be pointing to?  It patches functions generate_new_function,
generate_dealloc_function, generate_traverse_function, and
generate_clear_function.

The patch just compares the entry.name against "__weakref__"; this
could probably be centralized in the Entry object if so desired.
---

diff --git a/Cython/Compiler/Nodes.py b/Cython/Compiler/Nodes.py
index 12d45ff7..54f6b934 100644
--- a/Cython/Compiler/Nodes.py
+++ b/Cython/Compiler/Nodes.py
@@ -542,7 +542,10 @@ class ModuleNode(Node, BlockNode):
                 type.vtabptr_cname))
         for entry in scope.var_entries:
             if entry.type.is_pyobject:
-                code.put_init_var_to_py_none(entry, "p->%s")
+                if entry.name == "__weakref__":
+                    code.putln("p->%s = NULL;" % entry.cname)
+                else:
+                    code.put_init_var_to_py_none(entry, "p->%s")
         entry = scope.lookup_here("__new__")
         if entry:
             code.putln(
@@ -566,7 +569,12 @@ class ModuleNode(Node, BlockNode):
         self.generate_usr_dealloc_call(scope, code)
         for entry in scope.var_entries:
             if entry.type.is_pyobject:
-                code.put_xdecref("p->%s" % entry.cname, entry.type)
+                if entry.name == "__weakref__":
+                    code.putln(
+                        "if (p->%s) PyObject_ClearWeakRefs(o);" %
+                            entry.cname)
+                else:
+                    code.put_xdecref("p->%s" % entry.cname, entry.type)
         if base_type:
             code.putln(
                 "%s->tp_dealloc(o);" %
@@ -614,7 +622,7 @@ class ModuleNode(Node, BlockNode):
                     "e = %s->tp_traverse(o, v, a); if (e) return e;" %
                         base_type.typeptr_cname)
         for entry in scope.var_entries:
-            if entry.type.is_pyobject:
+            if entry.type.is_pyobject and entry.name != "__weakref__":
                 var_code = "p->%s" % entry.cname
                 code.putln(
                         "if (%s) {"
@@ -643,7 +651,7 @@ class ModuleNode(Node, BlockNode):
                 "%s->tp_clear(o);" %
                     base_type.typeptr_cname)
         for entry in scope.var_entries:
-            if entry.type.is_pyobject:
+            if entry.type.is_pyobject and entry.name != "__weakref__":
                 name = "p->%s" % entry.cname
                 code.put_xdecref(name, entry.type)
                 #code.put_init_to_py_none(name)