Escape angle brackets even when a character encoding is specified.

rubys · rubys · commit e52b6c8bac0b · 2007-06-20T14:18:33.000Z
Ultimately we will need an option to escape brackets when found in attribute
values to keep the XHTML crowd happy.

--HG--
extra : convert_revision : svn%3Aacbfec75-9323-0410-a652-858a13e371e0/trunk%40780
diff --git a/src/serializer.py b/src/serializer.py
@@ -12,6 +12,9 @@
 from filters.inject_meta_charset import Filter as InjectMetaCharsetFilter
 
 from constants import voidElements, booleanAttributes, spaceCharacters
+from constants import rcdataElements
+
+from xml.sax.saxutils import escape
 
 spaceCharacters = u"".join(spaceCharacters)
 
@@ -49,11 +52,10 @@ def htmlentityreplace_errors(exc):
 
     del register_error
 
-def escape_text(text, encoding):
-    return text.replace("&", "&amp;").encode(encoding, unicode_encode_errors)
+def encode(text, encoding):
+    return text.encode(encoding, unicode_encode_errors)
 
 class HTMLSerializer(object):
-    cdata_elements = frozenset(("style", "script", "xmp", "iframe", "noembed", "noframes", "noscript"))
 
     quote_attr_values = False
     quote_char = '"'
@@ -109,16 +111,13 @@ def serialize(self, treewalker, encoding=None):
                     else:
                         yield token["data"]
                 elif encoding:
-                    yield escape_text(token["data"], encoding)
+                    yield encode(escape(token["data"]), encoding)
                 else:
-                    yield token["data"] \
-                        .replace("&", "&amp;") \
-                        .replace("<", "&lt;")  \
-                        .replace(">", "&gt;")
+                    yield escape(token["data"])
 
             elif type in ("StartTag", "EmptyTag"):
                 name = token["name"]
-                if name in self.cdata_elements:
+                if name in rcdataElements:
                     in_cdata = True
                 elif in_cdata:
                     self.serializeError(_("Unexpected child element of a CDATA element"))
@@ -142,10 +141,9 @@ def serialize(self, treewalker, encoding=None):
                         else:
                             quote_attr = reduce(lambda x,y: x or (y in v),
                                 spaceCharacters + "<>\"'", False)
+                        v = v.replace("&", "&amp;")
                         if encoding:
-                            v = escape_text(v, encoding)
-                        else:
-                            v = v.replace("&", "&amp;")
+                            v = encode(v, encoding)
                         if quote_attr:
                             quote_char = self.quote_char
                             if self.use_best_quote_char:
@@ -174,7 +172,7 @@ def serialize(self, treewalker, encoding=None):
 
             elif type == "EndTag":
                 name = token["name"]
-                if name in self.cdata_elements:
+                if name in rcdataElements:
                     in_cdata = False
                 elif in_cdata:
                     self.serializeError(_("Unexpected child element of a CDATA element"))
