Test the acquisition legacy stuff on templates.

Minor cleanup.

lib/python/Products/Five/browser/tests/aqlegacy.py

@@ -22,18 +22,21 @@ from Products.Five import BrowserView
 from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
 
 class LegacyAttributes(BrowserView):
-    """Make sure that accessing those old aq_* attributes on Five
-    BrowserViews still works, even though BrowserView may not be an
-    Acquisition-decendant class anymore...
+    """Make sure that those old aq_* attributes on Five BrowserViews
+    still work, in particular aq_chain, even though BrowserView may
+    not be an Acquisition-decendant class anymore...
     """
 
     def __call__(self):
-        assert self.aq_parent == self.context
-        assert self.aq_inner == self
-        assert self.aq_base == self
-        assert self.aq_self == self
         return repr([obj for obj in self.aq_chain])
 
+class LegacyTemplate(BrowserView):
+
+    template = ViewPageTemplateFile('falcon.pt')
+
+    def __call__(self):
+        return self.template()
+
 class Explicit(Acquisition.Explicit):
 
     def render(self):

lib/python/Products/Five/browser/tests/aqlegacy.zcml

@@ -8,6 +8,13 @@
       permission="zope.Public"
       />
 
+  <browser:page
+      for="*"
+      name="template"
+      class=".aqlegacy.LegacyTemplate"
+      permission="zope.Public"
+      />
+
   <browser:page
       for="*"
       name="explicit"

lib/python/Products/Five/browser/tests/aqlegacy_ftest.txt

@@ -21,7 +21,10 @@ views still works (the printed output is the aq_chain of the view):
 
   >>> browser.open('http://localhost/test_folder_1_/attributes')
   >>> print browser.contents
-  [<Products.Five.metaclass.LegacyAttributes object at ...>, <Folder at /test_folder_1_>, <Application at >, <ZPublisher.BaseRequest.RequestContainer object at ...>]
+  [<Products.Five.metaclass.LegacyAttributes object at ...>,
+   <Folder at /test_folder_1_>,
+   <Application at >,
+   <ZPublisher.BaseRequest.RequestContainer object at ...>]
 
 Let's do some more manual tests with the view object.  But first we
 must get it:
@@ -31,6 +34,17 @@ must get it:
   >>> request = TestRequest()
   >>> view = getMultiAdapter((self.folder, request), name='attributes')
 
+Let's check for the various aq_* attributes:
+
+  >>> view.aq_parent == self.folder
+  True
+  >>> view.aq_inner == view
+  True
+  >>> view.aq_base == view
+  True
+  >>> view.aq_self == view
+  True
+
 Let's try to acquire something from the root folder:
 
   >>> button = view.aq_acquire('ZopeAttributionButton')
@@ -51,6 +65,28 @@ Views also still support the __of__ protocol, at least pro forma:
   >>> view == view.__of__(self.app)
   True
 
+Acquisition API legacy on a browser view's template
+---------------------------------------------------
+
+A view's template will also support the various aq_* attributes:
+
+  >>> view = getMultiAdapter((self.folder, request), name='template')
+  >>> template = view.template
+
+  >>> template.aq_parent == view
+  True
+  >>> template.aq_inner == template
+  True
+  >>> template.aq_base == template
+  True
+  >>> template.aq_self == template
+  True
+
+  >>> button = template.aq_acquire('ZopeAttributionButton')
+  >>> print button()
+  <a href="http://www.zope.org/Credits" target="_top"><img src="http://nohost/p_/ZopeButton" width="115" height="50" border="0" alt="Powered by Zope" /></a>
+
+
 Mixing in Acquisition.{Ex|Im}plicit
 -----------------------------------