[Zope-Checkins] CVS: Zope/lib/python/DocumentTemplate - DT_UI.py:1.12.4.4 DT_Var.py:1.57.4.1

[Chris McDonough]

Update of /cvs-repository/Zope/lib/python/DocumentTemplate
In directory cvs.zope.org:/tmp/cvs-serv16902/lib/python/DocumentTemplate

Modified Files:
      Tag: chrism-install-branch
	DT_UI.py DT_Var.py 
Log Message:
Merge chrism-install-branch with head.  Apologies for the spew.


=== Zope/lib/python/DocumentTemplate/DT_UI.py 1.12.4.3 => 1.12.4.4 ===


=== Zope/lib/python/DocumentTemplate/DT_Var.py 1.57 => 1.57.4.1 ===
--- Zope/lib/python/DocumentTemplate/DT_Var.py:1.57	Wed Aug 14 18:29:52 2002
+++ Zope/lib/python/DocumentTemplate/DT_Var.py	Sat Sep 28 21:40:31 2002
@@ -284,7 +284,7 @@
         if fmt=='s':
             # Keep tainted strings as tainted strings here.
             if not isinstance(val, TaintedString):
-                val=str(val)
+                val=ustr(val)
         else:
             # Keep tainted strings as tainted strings here.
             wastainted = 0
@@ -350,7 +350,7 @@
     # Unsafe data is explicitly quoted here; we don't expect this to be HTML
     # quoted later on anyway.
     if isinstance(v, TaintedString): v = v.quoted()
-    v=str(v)
+    v=ustr(v)
     if v.find('\r') >= 0: v=''.join(v.split('\r'))
     if v.find('\n') >= 0: v='<br />\n'.join(v.split('\n'))
     return v