Use apply__of__ at other places.

zopefoundation · Feb 22, 2017 · e2a1fa0 · e2a1fa0
1 parent 1e2774c
commit e2a1fa0
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/src/Acquisition/_Acquisition.c b/src/Acquisition/_Acquisition.c
@@ -643,10 +643,8 @@ Wrapper_findattr_name(Wrapper *self, char* name, PyObject *oname,
                 if (PyECMethod_Check(r) && PyECMethod_Self(r) == self->obj) {
                     ASSIGN(r, PyECMethod_New(r, OBJECT(self)));
                 }
-                else if (has__of__(r)) {
-                  ASSIGN(r, __of__(r, OBJECT(self)));
-                }
-                return r;
+                return apply__of__(r, OBJECT(self));
+
             } else if (!swallow_attribute_error()) {
                 return NULL;
             }
@@ -673,10 +671,10 @@ Wrapper_findattr_name(Wrapper *self, char* name, PyObject *oname,
 
             if (PyECMethod_Check(r) && PyECMethod_Self(r) == self->obj) {
                 ASSIGN(r, PyECMethod_New(r, OBJECT(self)));
-            } else if (has__of__(r)) {
-                ASSIGN(r, __of__(r, OBJECT(self)));
             }
 
+            r = apply__of__(r, OBJECT(self));
+
             if (r && filter) {
                 switch(apply_filter(filter, OBJECT(self), oname, r, extra, orig)) {
                     case -1: return NULL;