[Checkins] SVN: five.customerize/trunk/ support Z2 BoundPageTemplates, not just Z3's

David Glick davidglick at onenw.org
Thu Jul 23 00:31:30 EDT 2009


Log message for revision 102105:
  support Z2 BoundPageTemplates, not just Z3's

Changed:
  U   five.customerize/trunk/CHANGES.txt
  U   five.customerize/trunk/src/five/customerize/utils.py

-=-
Modified: five.customerize/trunk/CHANGES.txt
===================================================================
--- five.customerize/trunk/CHANGES.txt	2009-07-23 03:28:55 UTC (rev 102104)
+++ five.customerize/trunk/CHANGES.txt	2009-07-23 04:31:29 UTC (rev 102105)
@@ -4,6 +4,8 @@
 five.customerize 0.4 (unreleased)
 ---------------------------------
 
+Support Zope 2.12's BoundPageTemplateFile.
+
 Fixed deprecation warnings for use of Globals.
 
 Specify all package dependencies.

Modified: five.customerize/trunk/src/five/customerize/utils.py
===================================================================
--- five.customerize/trunk/src/five/customerize/utils.py	2009-07-23 03:28:55 UTC (rev 102104)
+++ five.customerize/trunk/src/five/customerize/utils.py	2009-07-23 04:31:29 UTC (rev 102105)
@@ -2,7 +2,8 @@
 from AccessControl import Unauthorized
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile as Z2PTF
 from zope.pagetemplate.pagetemplatefile import PageTemplateFile as Z3PTF
-from zope.app.pagetemplate.viewpagetemplatefile import BoundPageTemplate
+from Products.Five.browser.pagetemplatefile import BoundPageTemplate as Z2BPT
+from zope.app.pagetemplate.viewpagetemplatefile import BoundPageTemplate as Z3BPT
 
 
 def isTemplate(obj):
@@ -10,7 +11,7 @@
     # TODO: we should really check via interfaces, i.e. `providedBy` here,
     #       but the only class using interfaces atm is Z3PTF :(
     return isinstance(obj, Z2PTF) or isinstance(obj, Z3PTF) or \
-        isinstance(obj, BoundPageTemplate)
+        isinstance(obj, Z2BPT) or isinstance(obj, Z3BPT)
 
 
 def findViewletTemplate(viewlet):



More information about the Checkins mailing list