[Zope-Checkins] SVN: Zope/trunk/ Removed DWIM'y attempt to filter acquired-but-not-acceessible results

[Tres Seaver]

Log message for revision 26951:
  Removed DWIM'y attempt to filter acquired-but-not-acceessible results
  from 'guarded_getattr'.
  


Changed:
  U   Zope/trunk/doc/CHANGES.txt
  U   Zope/trunk/lib/python/AccessControl/ImplPython.py
  U   Zope/trunk/lib/python/AccessControl/cAccessControl.c


-=-
Modified: Zope/trunk/doc/CHANGES.txt
===================================================================
--- Zope/trunk/doc/CHANGES.txt	2004-08-07 13:44:20 UTC (rev 26950)
+++ Zope/trunk/doc/CHANGES.txt	2004-08-07 17:17:26 UTC (rev 26951)
@@ -144,6 +144,9 @@
 
     Bugs fixed
 
+     - Removed DWIM'y attempt to filter acquired-but-not-aceessible
+       results from 'guarded_getattr'.
+
      - Collector #1267: applied patch to fix segmentation faults on 
        x86_64 systems
 

Modified: Zope/trunk/lib/python/AccessControl/ImplPython.py
===================================================================
--- Zope/trunk/lib/python/AccessControl/ImplPython.py	2004-08-07 13:44:20 UTC (rev 26950)
+++ Zope/trunk/lib/python/AccessControl/ImplPython.py	2004-08-07 17:17:26 UTC (rev 26951)
@@ -554,10 +554,6 @@
             return v
 
         validate = SecurityManagement.getSecurityManager().validate
-        # Filter out the objects we can't access.
-        if hasattr(inst, 'aq_acquire'):
-            return inst.aq_acquire(name, aq_validate, validate)
-        # Or just try to get the attribute directly.
         if validate(inst, inst, name, v):
             return v
     raise Unauthorized, name

Modified: Zope/trunk/lib/python/AccessControl/cAccessControl.c
===================================================================
--- Zope/trunk/lib/python/AccessControl/cAccessControl.c	2004-08-07 13:44:20 UTC (rev 26950)
+++ Zope/trunk/lib/python/AccessControl/cAccessControl.c	2004-08-07 17:17:26 UTC (rev 26951)
@@ -2159,18 +2159,6 @@
         }
 
       /*
-        # Filter out the objects we can't access.
-        if hasattr(inst, 'aq_acquire'):
-            return inst.aq_acquire(name, aq_validate, validate)
-       */
-      if (aq_isWrapper(inst))
-        {
-          Py_DECREF(v);
-          return aq_Acquire(inst, name, aq_validate, validate, 1, NULL, 0);
-        }
-
-      /*
-        # Or just try to get the attribute directly.
         if validate(inst, inst, name, v):
             return v
        */