More removing the liberal xml parser

jgraham · jgraham · commit b2692fe1bc5c · 2009-07-12T12:53:03.000+02:00
diff --git a/parse.py b/parse.py
@@ -12,7 +12,7 @@
 #RELEASE remove
 sys.path.insert(0,os.path.abspath(os.path.join(__file__,'../src')))
 #END RELEASE
-from html5lib import html5parser, liberalxmlparser, sanitizer
+from html5lib import html5parser, sanitizer
 from html5lib.tokenizer import HTMLTokenizer
 from html5lib import treebuilders, serializer, treewalkers
 from html5lib import constants
@@ -52,10 +52,8 @@ def parse():
     else:
         tokenizer = HTMLTokenizer
 
-    if opts.liberalxml:
-        p = liberalxmlparser.XHTMLParser(tree=treebuilder, tokenizer=tokenizer)
-    else:
-        p = html5parser.HTMLParser(tree=treebuilder, tokenizer=tokenizer)
+
+    p = html5parser.HTMLParser(tree=treebuilder, tokenizer=tokenizer)
 
     if opts.fragment:
         parseMethod = p.parseFragment
@@ -196,9 +194,6 @@ def getOptParser():
     parser.add_option("", "--sanitize", action="store_true", default=False,
                       dest="sanitize", help="sanitize")
 
-    parser.add_option("", "--liberal-xml-parser", action="store_true", default=False,
-                      dest="liberalxml", help="parse with liberal xml parser")
-
     return parser
 
 if __name__ == "__main__":
diff --git a/src/html5lib/__init__.py b/src/html5lib/__init__.py
@@ -14,5 +14,3 @@
 from html5parser import HTMLParser, parse
 from treebuilders import getTreeBuilder
 from serializer import serialize
-
-from liberalxmlparser import XMLParser, XHTMLParser
diff --git a/tests/test_sax.py b/tests/test_sax.py
