Removed dependency and support for zope.app.pagetemplate. ViewPageTem…

…plateFiles in Zope2 need to be based on the Five version.
zopefoundation · May 18, 2012 · 067f037 · 067f037
1 parent 345ef91
commit 067f037
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -4,7 +4,7 @@ CHANGES
 1.0.4 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- Removed dependency and support for zope.app.pagetemplate.
 
 
 1.0.3 (2012-05-07)

diff --git a/setup.py b/setup.py
@@ -48,7 +48,6 @@
         'zope.testing',
         'zope.traversing',
         'zope.viewlet',
-        'zope.app.pagetemplate',
         'transaction',
         'Acquisition',
         'Zope2',

diff --git a/src/five/customerize/utils.py b/src/five/customerize/utils.py
@@ -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):