awesome-python
diff --git a/‎parse.py‎
Lines changed: 9 additions & 4 deletions b/‎parse.py‎
Lines changed: 9 additions & 4 deletions
diff --git a/‎src/serializer/htmlserializer.py‎
Lines changed: 4 additions & 2 deletions b/‎src/serializer/htmlserializer.py‎
Lines changed: 4 additions & 2 deletions
diff --git a/‎src/serializer/xhtmlserializer.py‎
Lines changed: 1 addition & 0 deletions b/‎src/serializer/xhtmlserializer.py‎
Lines changed: 1 addition & 0 deletions
@@ -98,7 +98,8 @@ def printOutput(parser, document, opts):
         for opt in ['inject_meta_charset', 'strip_whitespace', 'sanitize',
                     'omit_optional_tags', 'quote_attr_values', 'quote_char',
                     'use_best_quote_char', 'minimize_boolean_attributes',
-                    'use_trailing_solidus', 'escape_lt_in_attrs']:
+                    'use_trailing_solidus', 'escape_lt_in_attrs',
+                    'escape_rcdata']:
             kwargs[opt] = getattr(opts,opt)
         if not kwargs['quote_char']: del kwargs['quote_char']
         tokens = treewalkers.getTreeWalker(opts.treebuilder)(document)
@@ -162,15 +163,15 @@ def getOptParser():
                       default=False, dest="quote_attr_values",
                       help="quote attribute values")
 
-    parser.add_option("", "--use_best_quote_char", action="store_true",
+    parser.add_option("", "--use-best-quote-char", action="store_true",
                       default=False, dest="use_best_quote_char",
                       help="use best quote character")
 
     parser.add_option("", "--quote-char", action="store",
                       default=None, dest="quote_char",
                       help="quote character")
 
-    parser.add_option("", "--no-minimize_boolean_attributes",
+    parser.add_option("", "--no-minimize-boolean-attributes",
                       action="store_false", default=True,
                       dest="minimize_boolean_attributes",
                       help="minimize boolean attributes")
@@ -179,10 +180,14 @@ def getOptParser():
                       default=False, dest="use_trailing_solidus",
                       help="use trailing solidus")
 
-    parser.add_option("", "--escape_lt_in_attrs", action="store_true",
+    parser.add_option("", "--escape-lt-in-attrs", action="store_true",
                       default=False, dest="escape_lt_in_attrs",
                       help="escape less than signs in attribute values")
 
+    parser.add_option("", "--escape-rcdata", action="store_true",
+                      default=False, dest="escape_rcdata",
+                      help="escape rcdata element values")
+
     parser.add_option("", "--sanitize", action="store_true", default=False,
                       dest="sanitize", help="sanitize")
 
 
@@ -65,6 +65,7 @@ class HTMLSerializer(object):
     use_trailing_solidus = False
     space_before_trailing_solidus = True
     escape_lt_in_attrs = False
+    escape_rcdata = False
 
     omit_optional_tags = True
 
@@ -78,7 +79,8 @@ def __init__(self, **kwargs):
         for attr in ("quote_attr_values", "quote_char", "use_best_quote_char",
           "minimize_boolean_attributes", "use_trailing_solidus",
           "space_before_trailing_solidus", "omit_optional_tags",
-          "strip_whitespace", "inject_meta_charset", "escape_lt_in_attrs"):
+          "strip_whitespace", "inject_meta_charset", "escape_lt_in_attrs",
+          "escape_rcdata"):
             setattr(self, attr, kwargs.get(attr, getattr(self, attr)))
         self.errors = []
         self.strict = False
@@ -118,7 +120,7 @@ def serialize(self, treewalker, encoding=None):
 
             elif type in ("StartTag", "EmptyTag"):
                 name = token["name"]
-                if name in rcdataElements:
+                if name in rcdataElements and not self.escape_rcdata:
                     in_cdata = True
                 elif in_cdata:
                     self.serializeError(_("Unexpected child element of a CDATA element"))
 
@@ -6,3 +6,4 @@ class XHTMLSerializer(HTMLSerializer):
     use_trailing_solidus = True
     escape_lt_in_attrs = True
     omit_optional_tags = False
+    escape_rcdata = True