[Zope-Checkins] CVS: Zope3/lib/python/Zope/PageTemplate - TALES.py:1.1.2.12

[Guido van Rossum]

Update of /cvs-repository/Zope3/lib/python/Zope/PageTemplate
In directory cvs.zope.org:/tmp/cvs-serv23801/lib/python/Zope/PageTemplate

Modified Files:
      Tag: Zope-3x-branch
	TALES.py 
Log Message:
Anticipate None becoming a keyword in Python 2.3.  There are a few
functions with a default argument of the form None=None, as a speed
hack; this will break.

Note that in one case, None is not used in the function body; in
another case, None is used to pass an explicit 2nd arg to {}.get(),
but this defaults to None.  Draw your own conclusions...



=== Zope3/lib/python/Zope/PageTemplate/TALES.py 1.1.2.11 => 1.1.2.12 ===
         return not not self.evaluate(expr)
 
-    def evaluateText(self, expr, None=None):
+    def evaluateText(self, expr):
         text = self.evaluate(expr)
         if text is default_ or text is None:
             return text