[Zope-Checkins] CVS: Zope/lib/python/Products/PageTemplates - TALES.py:1.38.2.1

Godefroid Chapelle cvs-admin at zope.org
Fri Nov 21 07:17:39 EST 2003


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

Modified Files:
      Tag: Zope-2_7-branch
	TALES.py 
Log Message:
while it has been decided not to include Zope3
MessageID class support in 2.7,
this two lines fix eases its integration
for those who'll need it


=== Zope/lib/python/Products/PageTemplates/TALES.py 1.38 => 1.38.2.1 ===
--- Zope/lib/python/Products/PageTemplates/TALES.py:1.38	Wed May 14 17:55:14 2003
+++ Zope/lib/python/Products/PageTemplates/TALES.py	Fri Nov 21 07:17:38 2003
@@ -226,7 +226,10 @@
         text = self.evaluate(expr)
         if text is Default or text is None:
             return text
-        return ustr(text)
+        if isinstance(text, unicode):
+            return text
+        else:
+            return unicode(text)
 
     def evaluateStructure(self, expr):
         return self.evaluate(expr)




More information about the Zope-Checkins mailing list