[Zope3-checkins] CVS: Zope3/src/zope/app/pagetemplate - engine.py:1.18

[Steve Alexander]

Update of /cvs-repository/Zope3/src/zope/app/pagetemplate
In directory cvs.zope.org:/tmp/cvs-serv7660/src/zope/app/pagetemplate

Modified Files:
	engine.py 
Log Message:
Increased test coverage of the zope-specific tales engine.
Fixed bug where a different 'default' marker object was used in
zope.app.pagetemplate than in zope.tales
Added documentation of the required semantics of evaluateText to
the ITALExpressionEngine interface.



=== Zope3/src/zope/app/pagetemplate/engine.py 1.17 => 1.18 ===
--- Zope3/src/zope/app/pagetemplate/engine.py:1.17	Mon Jun 30 18:47:37 2003
+++ Zope3/src/zope/app/pagetemplate/engine.py	Tue Jul  1 13:30:59 2003
@@ -39,8 +39,6 @@
 
 from zope.app.traversing.adapters import Traverser
 
-_default = object()
-
 
 def zopeTraverser(object, path_items, econtext):
     """Traverses a sequence of names, first trying attributes then items.
@@ -70,7 +68,7 @@
 
     def evaluateText(self, expr):
         text = self.evaluate(expr)
-        if text is _default or text is None:
+        if text is self.getDefault() or text is None:
             return text
         if isinstance_ex(text, StringTypes):
             # text could be a proxied/wrapped object