Log message for revision 78424: Use the canonical forms of getting an object's innermost wrapper and an object's parent (by using the aq_inner() and aq_parent() functions, not the attributes).
Changed: U Zope/branches/philikon-aq/lib/python/AccessControl/ImplPython.py -=- Modified: Zope/branches/philikon-aq/lib/python/AccessControl/ImplPython.py =================================================================== --- Zope/branches/philikon-aq/lib/python/AccessControl/ImplPython.py 2007-07-28 12:12:24 UTC (rev 78423) +++ Zope/branches/philikon-aq/lib/python/AccessControl/ImplPython.py 2007-07-28 12:13:38 UTC (rev 78424) @@ -17,11 +17,8 @@ import string from logging import getLogger -from Acquisition import aq_base -from Acquisition import aq_parent -from Acquisition import aq_inner +from Acquisition import aq_base, aq_parent, aq_inner, aq_acquire from Acquisition import aq_inContextOf -from Acquisition import aq_acquire from ExtensionClass import Base from zope.interface import implements @@ -99,10 +96,10 @@ else: r = r + list(roles) - object = getattr(object, 'aq_inner', None) + object = aq_inner(object) if object is None: break - object = object.__parent__ + object = aq_parent(object) if r is None: if _embed_permission_in_roles: _______________________________________________ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins