Remove hooks to use ViewPageTemplateFile from z3c.pt because this bre…

…aks when

z3c.pt is available, but z3c.ptcompat is not included. As recommended by notes
in 1.4.0 release.

CHANGES.txt

@@ -5,7 +5,9 @@ CHANGES
 1.4.2 (unreleased)
 ------------------
 
-- ...
+- Remove hooks to use ViewPageTemplateFile from z3c.pt because this breaks when
+  z3c.pt is available, but z3c.ptcompat is not included. As recommended by notes
+  in 1.4.0 release.
 
 
 1.4.1 (2011-11-15)

src/z3c/macro/tests.py

@@ -17,21 +17,15 @@
 """
 __docformat__ = 'restructuredtext'
 
-from zope import component
 from zope.app.testing import setup
 from zope.configuration import xmlconfig
 import doctest
 import itertools
 import unittest
-import z3c.pt
-import z3c.ptcompat
 
 import z3c.macro.tales
 import z3c.macro.zcml
 
-# default template class
-_templateViewClass = z3c.macro.zcml.ViewPageTemplateFile
-
 
 def setUp(test):
     root = setup.placefulSetUp(site=True)
@@ -43,29 +37,17 @@ def setUpZPT(test):
     from zope.browserpage import metaconfigure
     metaconfigure.registerType('macro', z3c.macro.tales.MacroExpression)
 
-    # apply correct template classes
-    global _templateViewClass
-    _templateViewClass = z3c.macro.zcml.ViewPageTemplateFile
-    from zope.browserpage.viewpagetemplatefile import ViewPageTemplateFile
-    z3c.macro.zcml.ViewPageTemplateFile = ViewPageTemplateFile
-
 
 def setUpZ3CPT(suite):
     setUp(suite)
+    import z3c.pt
+    import z3c.ptcompat
     xmlconfig.XMLConfig('configure.zcml', z3c.pt)()
     xmlconfig.XMLConfig('configure.zcml', z3c.ptcompat)()
 
-    # apply correct template classes
-    global _templateViewClass
-    _templateViewClass = z3c.macro.zcml.ViewPageTemplateFile
-    from z3c.pt.pagetemplate import ViewPageTemplateFile
-    z3c.macro.zcml.ViewPageTemplateFile = ViewPageTemplateFile
-
 
 def tearDown(test):
     setup.placefulTearDown()
-    global _templateViewClass
-    z3c.macro.zcml.ViewPageTemplateFile = _templateViewClass
 
 
 def test_suite():

src/z3c/macro/zcml.py

@@ -25,13 +25,7 @@
 from zope.component import zcml
 from zope.publisher.interfaces.browser import IBrowserView
 from zope.publisher.interfaces.browser import IDefaultBrowserLayer
-
-try:
-    # use z3c.pt if available
-    from z3c.pt.pagetemplate import ViewPageTemplateFile
-except ImportError:
-    # or default if not
-    from zope.browserpage.viewpagetemplatefile import ViewPageTemplateFile
+from zope.browserpage.viewpagetemplatefile import ViewPageTemplateFile
 
 from z3c.macro import interfaces