Comment out the C extension. This should build conditionally, but thi…

…s is just for testing
zopefoundation · Mar 19, 2013 · b2ae9a9 · b2ae9a9
1 parent 9100fca
commit b2ae9a9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/setup.py b/setup.py
@@ -57,11 +57,11 @@ def read(*rnames):
       packages=find_packages('src'),
       package_dir = {'': 'src'},
       namespace_packages=['zope'],
-      ext_modules=[Extension("zope.container._zope_container_contained",
-                             [os.path.join("src", "zope", "container",
-                                           "_zope_container_contained.c")
-                              ], include_dirs=['include']),
-                   ],
+      #ext_modules=[Extension("zope.container._zope_container_contained",
+      #                       [os.path.join("src", "zope", "container",
+      #                                     "_zope_container_contained.c")
+      #                        ], include_dirs=['include']),
+      #             ],
       extras_require=dict(
           test=[
               'zope.configuration',

diff --git a/src/zope/container/_zope_container_contained.c b/src/zope/container/_zope_container_contained.c
@@ -32,7 +32,7 @@
 
 
 #include "Python.h"
-#include "persistent/cPersistence.h"
+#include "persistent/Persistence.h"
 
 static PyObject *str_p_deactivate;
 

diff --git a/src/zope/container/_zope_proxy_proxy.c b/src/zope/container/_zope_proxy_proxy.c
@@ -174,13 +174,15 @@ WrapperType_Lookup(PyTypeObject *type, PyObject *name)
 
         if (((PyTypeObject *)base) != &ProxyType) {
             if (PyClass_Check(base))
-                dict = ((PyClassObject *)base)->cl_dict;
+                dict = GetAttrString(base, "__dict__");
+                Py_INCREF(dict);
             else {
                 assert(PyType_Check(base));
                 dict = ((PyTypeObject *)base)->tp_dict;
             }
             assert(dict && PyDict_Check(dict));
             res = PyDict_GetItem(dict, name);
+            Py_DECREF(dict);
             if (res != NULL)
                 return res;
         }