[Checkins] SVN: z3c.template/trunk/ Remove hooks to use ViewPageTemplateFile from z3c.pt because this breaks when

[Gediminas Paulauskas]

Log message for revision 124401:
  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 z3c.ptcompat 1.0 release notes.
  Pluggable zope.pagetemplate and include of z3c.ptcompat will do that for us.
  
  

Changed:
  U   z3c.template/trunk/CHANGES.txt
  U   z3c.template/trunk/src/z3c/template/template.py
  U   z3c.template/trunk/src/z3c/template/tests.py

-=-
Modified: z3c.template/trunk/CHANGES.txt
===================================================================
--- z3c.template/trunk/CHANGES.txt	2012-02-15 17:00:14 UTC (rev 124400)
+++ z3c.template/trunk/CHANGES.txt	2012-02-15 17:50:33 UTC (rev 124401)
@@ -5,8 +5,11 @@
 1.4.1 (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
+  below.
 
+
 1.4.0 (2011-10-29)
 ------------------
 

Modified: z3c.template/trunk/src/z3c/template/template.py
===================================================================
--- z3c.template/trunk/src/z3c/template/template.py	2012-02-15 17:00:14 UTC (rev 124400)
+++ z3c.template/trunk/src/z3c/template/template.py	2012-02-15 17:50:33 UTC (rev 124401)
@@ -18,14 +18,8 @@
 from zope import component
 from zope.pagetemplate.interfaces import IPageTemplate
 from zope.pagetemplate.pagetemplate import PageTemplate
+from zope.browserpage.viewpagetemplatefile import ViewPageTemplateFile
 
-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 z3c.template import interfaces
 
 

Modified: z3c.template/trunk/src/z3c/template/tests.py
===================================================================
--- z3c.template/trunk/src/z3c/template/tests.py	2012-02-15 17:00:14 UTC (rev 124400)
+++ z3c.template/trunk/src/z3c/template/tests.py	2012-02-15 17:50:33 UTC (rev 124401)
@@ -25,24 +25,15 @@
 import z3c.template.template
 
 
-_templateViewClass = z3c.template.template.ViewPageTemplateFile
-
 def setUp(test):
     root = setup.placefulSetUp(site=True)
     test.globs['root'] = root
 
 def tearDown(test):
-    global _templateViewClass
-    z3c.template.template.ViewPageTemplateFile = _templateViewClass
     setup.placefulTearDown()
 
 def setUpZPT(suite):
     setUp(suite)
-    # apply correct template classes
-    global _templateViewClass
-    _templateViewClass = z3c.template.template.ViewPageTemplateFile
-    from zope.browserpage.viewpagetemplatefile import ViewPageTemplateFile
-    z3c.template.template.ViewPageTemplateFile = ViewPageTemplateFile
 
 def setUpZ3CPT(suite):
     setUp(suite)
@@ -51,12 +42,6 @@
     xmlconfig.XMLConfig('configure.zcml', z3c.pt)()
     xmlconfig.XMLConfig('configure.zcml', z3c.ptcompat)()
 
-    # apply correct template classes
-    global _templateViewClass
-    _templateViewClass = z3c.template.template.ViewPageTemplateFile
-    from z3c.pt.pagetemplate import ViewPageTemplateFile
-    z3c.template.template.ViewPageTemplateFile = ViewPageTemplateFile
-
     # We have to cook this template explicitly, because it's a module
     # global.
     from z3c.template.template import Macro