[ZPT] CVS: Zope/lib/python/Products/PageTemplates - TALES.py:1.31.6.3
Matthew T. Kromer
matt@zope.com
Fri, 20 Sep 2002 15:13:57 -0400
Update of /cvs-repository/Zope/lib/python/Products/PageTemplates
In directory cvs.zope.org:/tmp/cvs-serv5921/lib/python/Products/PageTemplates
Modified Files:
Tag: Zope-2_6-branch
TALES.py
Log Message:
Revert str->ustr changes which introduced unicode results where they
did not exist before. This caused breakage in the security machinery and
potentially in other places.
=== Zope/lib/python/Products/PageTemplates/TALES.py 1.31.6.2 => 1.31.6.3 ===
--- Zope/lib/python/Products/PageTemplates/TALES.py:1.31.6.2 Thu Sep 19 10:45:11 2002
+++ Zope/lib/python/Products/PageTemplates/TALES.py Fri Sep 20 15:13:56 2002
@@ -222,7 +222,7 @@
text = self.evaluate(expr)
if text is Default or text is None:
return text
- return ustr(text)
+ return str(text)
def evaluateStructure(self, expr):
return self.evaluate(expr)