[Zope-Checkins] CVS: Releases/Zope/lib/python/TAL - TALInterpreter.py:1.82

[Evan Simpson]

Update of /cvs-repository/Releases/Zope/lib/python/TAL
In directory cvs.zope.org:/tmp/cvs-serv24248/lib/python/TAL

Modified Files:
	TALInterpreter.py 
Log Message:
Back off a bit on attribute escaping so that tal:attribute values other than
'default' are still fully escaped.


=== Releases/Zope/lib/python/TAL/TALInterpreter.py 1.81 => 1.82 ===
--- Releases/Zope/lib/python/TAL/TALInterpreter.py:1.81	Wed Oct  1 13:27:40 2003
+++ Releases/Zope/lib/python/TAL/TALInterpreter.py	Fri Oct  3 14:54:47 2003
@@ -361,6 +361,8 @@
                 if evalue is None:
                     ok = 0
                 value = evalue
+        else:
+            evalue = None
 
         if ok:
             if xlat:
@@ -369,7 +371,11 @@
                     value = translated
             if value is None:
                 value = name
-            value = '%s="%s"' % (name, attrEscape(value))
+            elif evalue is self.Default:
+                value = attrEscape(value)
+            else:
+                value = escape(value)
+            value = '%s="%s"' % (name, value)
         return ok, name, value
     bytecode_handlers["<attrAction>"] = attrAction