[Checkins] SVN: zope.pagetemplate/trunk/ If no IPageTemplateEngine utility can be found, make doubly sure to

[Maurits van Rees]

Log message for revision 123964:
  If no IPageTemplateEngine utility can be found, make doubly sure to
  use the default PageTemplateEngine.
  

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-05 22:09:05 UTC (rev 123963)
+++ zope.pagetemplate/trunk/CHANGES.txt	2012-01-05 22:42:50 UTC (rev 123964)
@@ -5,6 +5,8 @@
 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-05 22:09:05 UTC (rev 123963)
+++ zope.pagetemplate/trunk/src/zope/pagetemplate/pagetemplate.py	2012-01-05 22:42:50 UTC (rev 123964)
@@ -205,6 +205,9 @@
             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: