Stop mixing in Five.bbb.AcquisitionBBB into browser components.

CHANGES.rst

@@ -30,6 +30,8 @@ Features Added
 Restructuring
 +++++++++++++
 
+- Stop mixing in `Five.bbb.AcquisitionBBB` into browser components.
+
 - Integrate `five.pt` code directly into `Products.PageTemplates`.
 
 - Move `Products.SiteAccess` into ZServer distribution.

src/App/FactoryDispatcher.py

@@ -90,7 +90,7 @@ def __bobo_traverse__(self, REQUEST, name):
             FactoryDispatcher)
 
         product = Product(name)
-        dispatcher = dispatcher_class(product, self.aq_parent, REQUEST)
+        dispatcher = dispatcher_class(product, self.__parent__, REQUEST)
         return dispatcher.__of__(self)
 
 

src/App/special_dtml.py

@@ -24,7 +24,7 @@
 import Zope2
 
 from Shared.DC.Scripts.Bindings import Bindings
-from Acquisition import Explicit, aq_inner, aq_parent
+from Acquisition import Explicit, aq_inner, aq_parent, aq_acquire
 from DocumentTemplate.DT_String import _marker, DTReturn, render_blocks
 from DocumentTemplate.DT_Util import TemplateDict, InstanceDict
 from AccessControl import getSecurityManager
@@ -166,7 +166,7 @@ def _exec(self, bound_data, args, kw):
         else:
             # We're first, so get the REQUEST.
             try:
-                req = self.aq_acquire('REQUEST')
+                req = aq_acquire(self, 'REQUEST')
                 if hasattr(req, 'taintWrapper'):
                     req = req.taintWrapper()
             except Exception:

src/App/tests/test_ApplicationManager.py

@@ -127,7 +127,7 @@ def test___getitem___hit(self):
         found = dc['foo']
         self.assertTrue(isinstance(found, AltDatabaseManager))
         self.assertEqual(found.id, 'foo')
-        self.assertTrue(found.aq_parent is dc)
+        self.assertTrue(found.__parent__ is dc)
         conn = found._p_jar
         self.assertTrue(isinstance(conn, FakeConnection))
         self.assertTrue(conn.db() is foo)
@@ -150,7 +150,7 @@ def test___bobo_traverse___hit_db(self):
         found = dc.__bobo_traverse__(None, 'foo')
         self.assertTrue(isinstance(found, AltDatabaseManager))
         self.assertEqual(found.id, 'foo')
-        self.assertTrue(found.aq_parent is dc)
+        self.assertTrue(found.__parent__ is dc)
         conn = found._p_jar
         self.assertTrue(isinstance(conn, FakeConnection))
         self.assertTrue(conn.db() is foo)

src/OFS/EtagSupport.py

@@ -13,11 +13,11 @@
 
 import time
 
+from Acquisition import aq_acquire
+from zExceptions import HTTPPreconditionFailed
 from zope.interface import implements
 from zope.interface import Interface
 
-from zExceptions import HTTPPreconditionFailed
-
 
 class EtagBaseInterface(Interface):
     """\
@@ -108,7 +108,7 @@ def http__processMatchHeaders(self, REQUEST=None):
         # Process if-match and if-none-match headers
 
         if REQUEST is None:
-            REQUEST = self.aq_acquire('REQUEST')
+            REQUEST = aq_acquire(self, 'REQUEST')
 
         matchlist = self.http__parseMatchList(REQUEST, 'if-match')
         nonematch = self.http__parseMatchList(REQUEST, 'if-none-match')

src/OFS/ObjectManager.py

@@ -33,7 +33,7 @@
 from AccessControl.Permissions import ftp_access
 from AccessControl import getSecurityManager
 from AccessControl.ZopeSecurityPolicy import getRoles
-from Acquisition import aq_base, aq_parent
+from Acquisition import aq_base, aq_acquire, aq_parent
 from Acquisition import Implicit
 from App.Common import is_acquired
 from App.config import getConfiguration
@@ -770,7 +770,7 @@ def all_meta_types(self, interfaces=None):
                 interfaces = self._product_interfaces
             elif hasattr(self, 'aq_acquire'):
                 try:
-                    interfaces = self.aq_acquire('_product_interfaces')
+                    interfaces = aq_acquire(self, '_product_interfaces')
                 except Exception:
                     pass
 

src/OFS/tests/testObjectManager.py

@@ -6,7 +6,7 @@
 from AccessControl.SecurityManager import setSecurityPolicy
 from AccessControl.SpecialUsers import emergency_user, nobody, system
 from AccessControl.User import User  # before SpecialUsers
-from Acquisition import Implicit
+from Acquisition import aq_self, Implicit
 from App.config import getConfiguration
 from logging import getLogger
 from zExceptions import BadRequest
@@ -444,8 +444,8 @@ def test___getitem___hit(self):
         si1 = SimpleItem('1')
         om['1'] = si1
         got = om['1']
-        self.assertTrue(got.aq_self is si1)
-        self.assertTrue(got.aq_parent is om)
+        self.assertTrue(aq_self(got) is si1)
+        self.assertTrue(got.__parent__ is om)
 
     def test_get_miss_wo_default(self):
         om = self._makeOne()
@@ -465,8 +465,8 @@ def test_get_hit(self):
         si1 = SimpleItem('1')
         om['1'] = si1
         got = om.get('1')
-        self.assertTrue(got.aq_self is si1)
-        self.assertTrue(got.aq_parent is om)
+        self.assertTrue(aq_self(got) is si1)
+        self.assertTrue(got.__parent__ is om)
 
     def test_items(self):
         om = self._makeOne()

src/Products/Five/browser/__init__.py

@@ -14,28 +14,21 @@
 """Provide basic browser functionality
 """
 
-import Acquisition
-import zope.publisher.browser
+from zope.publisher import browser
 
-from Products.Five.bbb import AcquisitionBBB
 
-
-class BrowserView(zope.publisher.browser.BrowserView, AcquisitionBBB):
+class BrowserView(browser.BrowserView):
 
     # Use an explicit __init__ to work around problems with magically inserted
     # super classes when using BrowserView as a base for viewlets.
     def __init__(self, context, request):
         self.context = context
         self.request = request
 
-    # Classes which are still based on Acquisition and access
-    # self.context in a method need to call aq_inner on it, or get a
-    # funky aq_chain. We do this here for BBB friendly purposes.
-
     def __getParent(self):
-        return getattr(self, '_parent', Acquisition.aq_inner(self.context))
+        return getattr(self, '_parent', self.context)
 
     def __setParent(self, parent):
         self._parent = parent
 
-    aq_parent = __parent__ = property(__getParent, __setParent)
+    __parent__ = property(__getParent, __setParent)

src/Products/Five/browser/pagetemplatefile.py

@@ -24,8 +24,6 @@
 from Products.PageTemplates.Expressions import SecureModuleImporter
 from Products.PageTemplates.Expressions import createTrustedZopeEngine
 
-from Products.Five.bbb import AcquisitionBBB
-
 _engine = createTrustedZopeEngine()
 
 
@@ -107,12 +105,10 @@ def __getitem__(self, name):
         return getMultiAdapter((self.ob, self.request), name=name)
 
 # When a view's template is accessed e.g. as template.view, a
-# BoundPageTemplate object is returned. For BBB reasons, it needs to
-# support the aq_* methods and attributes known from Acquisition.  For
-# that it also needs to be locatable through __parent__.
+# BoundPageTemplate object is returned.
 
 
-class BoundPageTemplate(AcquisitionBBB):
+class BoundPageTemplate(object):
     def __init__(self, pt, ob):
         object.__setattr__(self, 'im_func', pt)
         object.__setattr__(self, 'im_self', ob)

src/Products/Five/browser/resource.py

@@ -26,7 +26,6 @@
 from zope.publisher.interfaces.browser import IBrowserPublisher
 from zope.ptresource.ptresource import PageTemplate
 
-from Acquisition import aq_base
 from Products.Five.browser import BrowserView
 
 
@@ -175,7 +174,7 @@ def get(self, name, default=_marker):
 
         # We need to propagate security so that restrictedTraverse() will
         # work
-        if hasattr(aq_base(self), '__roles__'):
+        if hasattr(self, '__roles__'):
             resource.__roles__ = self.__roles__
 
         return resource