[Checkins] SVN: z3c.pagelet/trunk/s using the IContentTempalte interface of z3c.template 1.1a1

Christian Zagrodnick cz at gocept.com
Thu Sep 27 04:22:55 EDT 2007


Log message for revision 80190:
  using the IContentTempalte interface of z3c.template 1.1a1

Changed:
  U   z3c.pagelet/trunk/setup.py
  U   z3c.pagelet/trunk/src/z3c/pagelet/README.txt
  U   z3c.pagelet/trunk/src/z3c/pagelet/browser.py

-=-
Modified: z3c.pagelet/trunk/setup.py
===================================================================
--- z3c.pagelet/trunk/setup.py	2007-09-27 08:22:16 UTC (rev 80189)
+++ z3c.pagelet/trunk/setup.py	2007-09-27 08:22:54 UTC (rev 80190)
@@ -47,7 +47,7 @@
         'Operating System :: OS Independent',
         'Topic :: Internet :: WWW/HTTP',
         'Framework :: Zope3'],
-    url = 'http://svn.zope.org/z3c.pagelet',
+    url = 'http://pypi.python.org/pypi/z3c.pagelet',
     packages = find_packages('src'),
     include_package_data = True,
     package_dir = {'':'src'},
@@ -57,7 +57,7 @@
         ),
     install_requires = [
         'setuptools',
-        'z3c.template',
+        'z3c.template>=1.1a1',
         'zope.app.component',
         'zope.app.form',
         'zope.app.pagetemplate',

Modified: z3c.pagelet/trunk/src/z3c/pagelet/README.txt
===================================================================
--- z3c.pagelet/trunk/src/z3c/pagelet/README.txt	2007-09-27 08:22:16 UTC (rev 80189)
+++ z3c.pagelet/trunk/src/z3c/pagelet/README.txt	2007-09-27 08:22:54 UTC (rev 80190)
@@ -35,7 +35,7 @@
 The base implementation called BrowserPagelet offers built in __call__ and
 render methods which provide the different template lookup. Take a look at the
 BrowserPage class located in z3c.pagelet.browser and you can see that render
-method returns a IPageTemplate and the __call__ method a ILayoutTemplate
+method returns a IContentTemplate and the __call__ method a ILayoutTemplate
 defined in the z3c.layout package.
 
   # some test stuff
@@ -77,11 +77,12 @@
 allows us to register a more specific template in the next sample:
 
   >>> from zope.publisher.interfaces.browser import IDefaultBrowserLayer
-  >>> from zope.pagetemplate.interfaces import IPageTemplate
+  >>> from z3c.template.interfaces import IContentTemplate
   >>> from z3c.template.template import TemplateFactory
   >>> factory = TemplateFactory(contentTemplate, 'text/html')
-  >>> zope.component.provideAdapter(factory,
-  ...     (zope.interface.Interface, IDefaultBrowserLayer), IPageTemplate)
+  >>> zope.component.provideAdapter(
+  ...     factory, (zope.interface.Interface, IDefaultBrowserLayer),
+  ...     IContentTemplate)
 
 And register the layout template useing the ``Interface`` as registration base:
 
@@ -199,8 +200,9 @@
   >>> baseDir = os.path.split(pagelet.__file__)[0]
   >>> formTemplate = os.path.join(baseDir, 'form.pt')
   >>> factory = TemplateFactory(formTemplate, 'text/html')
-  >>> zope.component.provideAdapter(factory,
-  ...     (interfaces.IPageletForm, IDefaultBrowserLayer), IPageTemplate)
+  >>> zope.component.provideAdapter(
+  ...     factory,
+  ...     (interfaces.IPageletForm, IDefaultBrowserLayer), IContentTemplate)
 
 And we define a new interface includig text attribute:
 

Modified: z3c.pagelet/trunk/src/z3c/pagelet/browser.py
===================================================================
--- z3c.pagelet/trunk/src/z3c/pagelet/browser.py	2007-09-27 08:22:16 UTC (rev 80189)
+++ z3c.pagelet/trunk/src/z3c/pagelet/browser.py	2007-09-27 08:22:54 UTC (rev 80190)
@@ -20,10 +20,9 @@
 import zope.interface
 import zope.component
 from zope.formlib import form
-from zope.pagetemplate.interfaces import IPageTemplate
 from zope.publisher import browser
 
-from z3c.template.interfaces import ILayoutTemplate
+from z3c.template.interfaces import ILayoutTemplate, IContentTemplate
 from z3c.pagelet import interfaces
 
 
@@ -43,7 +42,7 @@
         # render content template
         if self.template is None:
             template = zope.component.getMultiAdapter(
-                (self, self.request), IPageTemplate)
+                (self, self.request), IContentTemplate)
             return template(self)
         return self.template()
 
@@ -51,8 +50,8 @@
         """Calls update and returns the layout template which calls render."""
         self.update()
         if self.layout is None:
-            layout = zope.component.getMultiAdapter((self, self.request),
-                ILayoutTemplate)
+            layout = zope.component.getMultiAdapter(
+                (self, self.request), ILayoutTemplate)
             return layout(self)
         return self.layout()
 
@@ -80,7 +79,7 @@
                 self.form_reset = False
             if self.template is None:
                 template = zope.component.getMultiAdapter(
-                    (self, self.request), IPageTemplate)
+                    (self, self.request), IContentTemplate)
                 self.form_result = template(self)
             else:
                 self.form_result = self.template()
@@ -100,7 +99,7 @@
         # render content template
         if self.template is None:
             template = zope.component.getMultiAdapter(
-                (self, self.request), IPageTemplate)
+                (self, self.request), IContentTemplate)
             return template(self)
         return self.template()
 



More information about the Checkins mailing list