Log message for revision 37823: clean up imports to reduce differences with the Zope 3 version
Changed: U Zope/trunk/lib/python/TAL/TALInterpreter.py -=- Modified: Zope/trunk/lib/python/TAL/TALInterpreter.py =================================================================== --- Zope/trunk/lib/python/TAL/TALInterpreter.py 2005-08-09 20:55:34 UTC (rev 37822) +++ Zope/trunk/lib/python/TAL/TALInterpreter.py 2005-08-09 21:13:26 UTC (rev 37823) @@ -17,9 +17,7 @@ """ import cgi import sys -import getopt import re -from cgi import escape # Do not use cStringIO here! It's not unicode aware. :( from StringIO import StringIO @@ -392,7 +390,7 @@ elif evalue is self.Default: value = attrEscape(value) else: - value = escape(value, quote=1) + value = cgi.escape(value, quote=1) value = '%s="%s"' % (name, value) return ok, name, value bytecode_handlers["<attrAction>"] = attrAction @@ -507,7 +505,7 @@ if isinstance(text, MessageID): # Translate this now. text = self.engine.translate(text.domain, text, text.mapping) - s = escape(text) + s = cgi.escape(text) self._stream_write(s) i = s.rfind('\n') if i < 0: _______________________________________________ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins