[Checkins] SVN: five.customerize/trunk/ Removed dependency and support for zope.app.pagetemplate. ViewPageTemplateFiles in Zope2 need to be based on the Five version.
Hano Schlichting
cvs-admin at zope.org
Fri May 18 17:18:06 UTC 2012
Log message for revision 126210:
Removed dependency and support for zope.app.pagetemplate. ViewPageTemplateFiles in Zope2 need to be based on the Five version.
Changed:
U five.customerize/trunk/CHANGES.txt
U five.customerize/trunk/setup.py
U five.customerize/trunk/src/five/customerize/utils.py
-=-
Modified: five.customerize/trunk/CHANGES.txt
===================================================================
--- five.customerize/trunk/CHANGES.txt 2012-05-18 17:14:18 UTC (rev 126209)
+++ five.customerize/trunk/CHANGES.txt 2012-05-18 17:18:02 UTC (rev 126210)
@@ -4,7 +4,7 @@
1.0.4 (unreleased)
------------------
-- Nothing changed yet.
+- Removed dependency and support for zope.app.pagetemplate.
1.0.3 (2012-05-07)
Modified: five.customerize/trunk/setup.py
===================================================================
--- five.customerize/trunk/setup.py 2012-05-18 17:14:18 UTC (rev 126209)
+++ five.customerize/trunk/setup.py 2012-05-18 17:18:02 UTC (rev 126210)
@@ -48,7 +48,6 @@
'zope.testing',
'zope.traversing',
'zope.viewlet',
- 'zope.app.pagetemplate',
'transaction',
'Acquisition',
'Zope2',
Modified: five.customerize/trunk/src/five/customerize/utils.py
===================================================================
--- five.customerize/trunk/src/five/customerize/utils.py 2012-05-18 17:14:18 UTC (rev 126209)
+++ five.customerize/trunk/src/five/customerize/utils.py 2012-05-18 17:18:02 UTC (rev 126210)
@@ -3,15 +3,13 @@
from Products.PageTemplates.PageTemplateFile import PageTemplateFile as Z2PTF
from zope.pagetemplate.pagetemplatefile import PageTemplateFile as Z3PTF
from Products.Five.browser.pagetemplatefile import BoundPageTemplate as Z2BPT
-from zope.app.pagetemplate.viewpagetemplatefile import BoundPageTemplate as Z3BPT
def isTemplate(obj):
""" check if the given object is a or is derived from a template class """
# 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, Z2BPT) or isinstance(obj, Z3BPT)
+ return isinstance(obj, (Z2PTF, Z3PTF, Z2BPT))
def findViewletTemplate(viewlet):
More information about the checkins
mailing list