Don't create wrappers when retrieving parent pointers.

zopefoundation · Nov 2, 2011 · afb8488 · afb8488
1 parent 2c0cc2d
commit afb8488
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,9 +1,10 @@
 Changelog
 =========
 
-2.13.3 (unreleased)
--------------------
+4.0 (unreleased)
+----------------
 
+- Don't create wrappers when retrieving parent pointers.
 
 2.13.2 (2010-06-16)
 -------------------

diff --git a/setup.py b/setup.py
@@ -20,7 +20,7 @@
 CHANGES = open('CHANGES.txt').read()
 
 setup(name='ExtensionClass',
-      version = '2.13.3dev',
+      version = '4.0dev',
       url='http://pypi.python.org/pypi/ExtensionClass',
       license='ZPL 2.1',
       description='Metaclass for subclassable extension types',

diff --git a/src/ExtensionClass/_ExtensionClass.c b/src/ExtensionClass/_ExtensionClass.c
@@ -152,8 +152,8 @@ Base_getattro(PyObject *obj, PyObject *name)
                           /* CHANGED!
                              If the tp_descr_get of res is of_get, 
                              then call it. */
-
-                          if (PyObject_TypeCheck(res->ob_type,
+                          if ((strcmp(PyString_AsString(name), "__parent__") != 0) &&
+                              PyObject_TypeCheck(res->ob_type,
                                                  &ExtensionClassType)
                               && res->ob_type->tp_descr_get != NULL) {
                             PyObject *tres;