[ZPT] CVS: Zope/lib/python/TAL - DummyEngine.py:1.32.6.2 TALInterpreter.py:1.69.6.4
Matthew T. Kromer
matt@zope.com
Fri, 20 Sep 2002 15:13:57 -0400
Update of /cvs-repository/Zope/lib/python/TAL
In directory cvs.zope.org:/tmp/cvs-serv5921/lib/python/TAL
Modified Files:
Tag: Zope-2_6-branch
DummyEngine.py TALInterpreter.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/TAL/DummyEngine.py 1.32.6.1 => 1.32.6.2 ===
--- Zope/lib/python/TAL/DummyEngine.py:1.32.6.1 Wed Sep 18 10:54:13 2002
+++ Zope/lib/python/TAL/DummyEngine.py Fri Sep 20 15:13:56 2002
@@ -138,7 +138,7 @@
def evaluateText(self, expr):
text = self.evaluate(expr)
if text is not None and text is not Default:
- text = ustr(text)
+ text = str(text)
return text
def evaluateStructure(self, expr):
=== Zope/lib/python/TAL/TALInterpreter.py 1.69.6.3 => 1.69.6.4 ===
--- Zope/lib/python/TAL/TALInterpreter.py:1.69.6.3 Thu Sep 19 10:45:11 2002
+++ Zope/lib/python/TAL/TALInterpreter.py Fri Sep 20 15:13:56 2002
@@ -550,7 +550,7 @@
if structure is self.Default:
self.interpret(block)
return
- text = ustr(structure)
+ text = str(structure)
if not (repldict or self.strictinsert):
# Take a shortcut, no error checking
self.stream_write(text)