[Checkins] SVN: zope.pagetemplate/trunk/ Revert last change as it is not needed after all.

Maurits van Rees m.van.rees at zestsoftware.nl
Fri Jan 6 15:10:28 UTC 2012


Log message for revision 123968:
  Revert last change as it is not needed after all.
  
  This is an error in test setup of a different package that creates a too simply dummy site manager context.

Changed:
  U   zope.pagetemplate/trunk/CHANGES.txt
  U   zope.pagetemplate/trunk/src/zope/pagetemplate/pagetemplate.py

-=-
Modified: zope.pagetemplate/trunk/CHANGES.txt
===================================================================
--- zope.pagetemplate/trunk/CHANGES.txt	2012-01-06 13:50:10 UTC (rev 123967)
+++ zope.pagetemplate/trunk/CHANGES.txt	2012-01-06 15:10:28 UTC (rev 123968)
@@ -5,8 +5,6 @@
 3.6.4 (unreleased)
 ------------------
 
-- If no IPageTemplateEngine utility can be found, make doubly sure to
-  use the default PageTemplateEngine.
 
 3.6.3 (2011-09-21)
 ------------------

Modified: zope.pagetemplate/trunk/src/zope/pagetemplate/pagetemplate.py
===================================================================
--- zope.pagetemplate/trunk/src/zope/pagetemplate/pagetemplate.py	2012-01-06 13:50:10 UTC (rev 123967)
+++ zope.pagetemplate/trunk/src/zope/pagetemplate/pagetemplate.py	2012-01-06 15:10:28 UTC (rev 123968)
@@ -205,9 +205,6 @@
             engine = queryUtility(
                 IPageTemplateEngine, default=PageTemplateEngine
                 )
-            if engine is None:
-                # We gave a default so this should not happen, but it does.
-                engine = PageTemplateEngine
             self._v_program, self._v_macros = engine.cook(
                 source_file, self._text, pt_engine, self.content_type)
         except:



More information about the checkins mailing list