[Zope3-checkins] CVS: Zope3/src/zope/tales - tales.py:1.12

[Steve Alexander]

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

Modified Files:
	tales.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/tales/tales.py 1.11 => 1.12 ===
--- Zope3/src/zope/tales/tales.py:1.11	Mon Jun 30 18:46:23 2003
+++ Zope3/src/zope/tales/tales.py	Tue Jul  1 13:31:04 2003
@@ -57,8 +57,6 @@
 
 _default = object()
 
-_marker = object()
-
 class Iterator(object):
     """TALES Iterator
     """
@@ -663,7 +661,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
         return unicode(text)