[ZPT] CVS: Zope/lib/python/Products/PageTemplates - TALES.py:1.31.8.2

Florent Guillaume fg@nuxeo.com
Sun, 15 Sep 2002 20:01:16 -0400


Update of /cvs-repository/Zope/lib/python/Products/PageTemplates
In directory cvs.zope.org:/tmp/cvs-serv1822/Products/PageTemplates

Modified Files:
      Tag: Zope-2_6-i18n-branch
	TALES.py 
Log Message:
Improved support for Unicode in TAL and ZPT.
Added tests that exercise that.


=== Zope/lib/python/Products/PageTemplates/TALES.py 1.31.8.1 => 1.31.8.2 ===
--- Zope/lib/python/Products/PageTemplates/TALES.py:1.31.8.1	Sun Sep 15 18:43:33 2002
+++ Zope/lib/python/Products/PageTemplates/TALES.py	Sun Sep 15 20:00:46 2002
@@ -19,6 +19,7 @@
 
 import re, sys, ZTUtils
 from MultiMapping import MultiMapping
+from DocumentTemplate.DT_Util import ustr
 
 StringType = type('')
 
@@ -226,7 +227,7 @@
         text = self.evaluate(expr)
         if text is Default or text is None:
             return text
-        return str(text)
+        return ustr(text)
 
     def evaluateStructure(self, expr):
         return self.evaluate(expr)