[Zope-Checkins] CVS: Packages/AccessControl - ImplPython.py:1.1.2.4 cAccessControl.c:1.20.2.10

Tres Seaver tseaver at zope.com
Sat Aug 7 13:16:18 EDT 2004


Update of /cvs-repository/Packages/AccessControl
In directory cvs.zope.org:/tmp/cvs-serv31145/lib/python/AccessControl

Modified Files:
      Tag: Zope-2_7-branch
	ImplPython.py cAccessControl.c 
Log Message:


  - Removed DWIM'y attempt to filter acquired-but-not-aceessible
    results from 'guarded_getattr'.


=== Packages/AccessControl/ImplPython.py 1.1.2.3 => 1.1.2.4 ===
--- Packages/AccessControl/ImplPython.py:1.1.2.3	Tue Jan 27 12:10:33 2004
+++ Packages/AccessControl/ImplPython.py	Sat Aug  7 13:15:48 2004
@@ -551,10 +551,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


=== Packages/AccessControl/cAccessControl.c 1.20.2.9 => 1.20.2.10 ===
--- Packages/AccessControl/cAccessControl.c:1.20.2.9	Mon Jul 26 16:08:17 2004
+++ Packages/AccessControl/cAccessControl.c	Sat Aug  7 13:15:48 2004
@@ -2111,18 +2111,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
        */



More information about the Zope-Checkins mailing list