Update of /cvs-repository/Zope/lib/python/TAL
In directory cvs.zope.org:/tmp/cvs-serv9625/lib/python/TAL
Modified Files:
Tag: Zope-2_6-branch
DummyEngine.py TALInterpreter.py
Log Message:
Reapply str->ustr conversions, since they were held harmless by testing
=== Zope/lib/python/TAL/DummyEngine.py 1.32.6.2 => 1.32.6.3 ===
--- Zope/lib/python/TAL/DummyEngine.py:1.32.6.2 Fri Sep 20 15:13:56 2002
+++ Zope/lib/python/TAL/DummyEngine.py Fri Sep 20 15:52:25 2002
@@ -138,7 +138,7 @@
def evaluateText(self, expr):
text = self.evaluate(expr)
if text is not None and text is not Default:
- text = str(text)
+ text = ustr(text)
return text
def evaluateStructure(self, expr):
=== Zope/lib/python/TAL/TALInterpreter.py 1.69.6.4 => 1.69.6.5 ===
--- Zope/lib/python/TAL/TALInterpreter.py:1.69.6.4 Fri Sep 20 15:13:56 2002
+++ Zope/lib/python/TAL/TALInterpreter.py Fri Sep 20 15:52:25 2002
@@ -550,7 +550,7 @@
if structure is self.Default:
self.interpret(block)
return
- text = str(structure)
+ text = ustr(structure)
if not (repldict or self.strictinsert):
# Take a shortcut, no error checking
self.stream_write(text)