Scripting parameter for parse.py (html5lib#1)

neumond · gsnedders · commit 482370391e47 · 2016-05-10T23:07:03.000-07:00
diff --git a/.pytest.expect b/.pytest.expect
@@ -293,43 +293,6 @@ u'html5lib/tests/testdata/tree-construction/namespace-sensitivity.dat::0::cEleme
 u'html5lib/tests/testdata/tree-construction/namespace-sensitivity.dat::0::cElementTree::parser::void-namespace': FAIL
 u'html5lib/tests/testdata/tree-construction/namespace-sensitivity.dat::0::lxml::parser::namespaced': FAIL
 u'html5lib/tests/testdata/tree-construction/namespace-sensitivity.dat::0::lxml::parser::void-namespace': FAIL
-u'html5lib/tests/testdata/tree-construction/noscript01.dat::10::DOM::parser::namespaced': FAIL
-u'html5lib/tests/testdata/tree-construction/noscript01.dat::10::DOM::parser::void-namespace': FAIL
-u'html5lib/tests/testdata/tree-construction/noscript01.dat::10::ElementTree::parser::namespaced': FAIL
-u'html5lib/tests/testdata/tree-construction/noscript01.dat::10::ElementTree::parser::void-namespace': FAIL
-u'html5lib/tests/testdata/tree-construction/noscript01.dat::10::cElementTree::parser::namespaced': FAIL
-u'html5lib/tests/testdata/tree-construction/noscript01.dat::10::cElementTree::parser::void-namespace': FAIL
-u'html5lib/tests/testdata/tree-construction/noscript01.dat::10::lxml::parser::namespaced': FAIL
-u'html5lib/tests/testdata/tree-construction/noscript01.dat::10::lxml::parser::void-namespace': FAIL
-u'html5lib/tests/testdata/tree-construction/noscript01.dat::16::DOM::parser::namespaced': FAIL
-u'html5lib/tests/testdata/tree-construction/noscript01.dat::16::DOM::parser::void-namespace': FAIL
-u'html5lib/tests/testdata/tree-construction/noscript01.dat::16::ElementTree::parser::namespaced': FAIL
-u'html5lib/tests/testdata/tree-construction/noscript01.dat::16::ElementTree::parser::void-namespace': FAIL
-u'html5lib/tests/testdata/tree-construction/noscript01.dat::16::cElementTree::parser::namespaced': FAIL
-u'html5lib/tests/testdata/tree-construction/noscript01.dat::16::cElementTree::parser::void-namespace': FAIL
-u'html5lib/tests/testdata/tree-construction/noscript01.dat::16::lxml::parser::namespaced': FAIL
-u'html5lib/tests/testdata/tree-construction/noscript01.dat::16::lxml::parser::void-namespace': FAIL
-u'html5lib/tests/testdata/tree-construction/noscript01.dat::17::DOM::parser::namespaced': FAIL
-u'html5lib/tests/testdata/tree-construction/noscript01.dat::17::DOM::parser::void-namespace': FAIL
-u'html5lib/tests/testdata/tree-construction/noscript01.dat::17::DOM::treewalker': FAIL
-u'html5lib/tests/testdata/tree-construction/noscript01.dat::17::ElementTree::parser::namespaced': FAIL
-u'html5lib/tests/testdata/tree-construction/noscript01.dat::17::ElementTree::parser::void-namespace': FAIL
-u'html5lib/tests/testdata/tree-construction/noscript01.dat::17::ElementTree::treewalker': FAIL
-u'html5lib/tests/testdata/tree-construction/noscript01.dat::17::cElementTree::parser::namespaced': FAIL
-u'html5lib/tests/testdata/tree-construction/noscript01.dat::17::cElementTree::parser::void-namespace': FAIL
-u'html5lib/tests/testdata/tree-construction/noscript01.dat::17::cElementTree::treewalker': FAIL
-u'html5lib/tests/testdata/tree-construction/noscript01.dat::17::genshi::treewalker': FAIL
-u'html5lib/tests/testdata/tree-construction/noscript01.dat::17::lxml::parser::namespaced': FAIL
-u'html5lib/tests/testdata/tree-construction/noscript01.dat::17::lxml::parser::void-namespace': FAIL
-u'html5lib/tests/testdata/tree-construction/noscript01.dat::17::lxml::treewalker': FAIL
-u'html5lib/tests/testdata/tree-construction/noscript01.dat::9::DOM::parser::namespaced': FAIL
-u'html5lib/tests/testdata/tree-construction/noscript01.dat::9::DOM::parser::void-namespace': FAIL
-u'html5lib/tests/testdata/tree-construction/noscript01.dat::9::ElementTree::parser::namespaced': FAIL
-u'html5lib/tests/testdata/tree-construction/noscript01.dat::9::ElementTree::parser::void-namespace': FAIL
-u'html5lib/tests/testdata/tree-construction/noscript01.dat::9::cElementTree::parser::namespaced': FAIL
-u'html5lib/tests/testdata/tree-construction/noscript01.dat::9::cElementTree::parser::void-namespace': FAIL
-u'html5lib/tests/testdata/tree-construction/noscript01.dat::9::lxml::parser::namespaced': FAIL
-u'html5lib/tests/testdata/tree-construction/noscript01.dat::9::lxml::parser::void-namespace': FAIL
 u'html5lib/tests/testdata/tree-construction/ruby.dat::0::DOM::parser::namespaced': FAIL
 u'html5lib/tests/testdata/tree-construction/ruby.dat::0::DOM::parser::void-namespace': FAIL
 u'html5lib/tests/testdata/tree-construction/ruby.dat::0::ElementTree::parser::namespaced': FAIL
diff --git a/parse.py b/parse.py
@@ -65,11 +65,12 @@ def parse():
     if opts.profile:
         import cProfile
         import pstats
-        cProfile.runctx("run(parseMethod, f, encoding)", None,
+        cProfile.runctx("run(parseMethod, f, encoding, scripting)", None,
                         {"run": run,
                          "parseMethod": parseMethod,
                          "f": f,
-                         "encoding": encoding},
+                         "encoding": encoding,
+                         "scripting": opts.scripting},
                         "stats.prof")
         # XXX - We should use a temp file here
         stats = pstats.Stats('stats.prof')
@@ -79,7 +80,7 @@ def parse():
     elif opts.time:
         import time
         t0 = time.time()
-        document = run(parseMethod, f, encoding)
+        document = run(parseMethod, f, encoding, opts.scripting)
         t1 = time.time()
         if document:
             printOutput(p, document, opts)
@@ -88,13 +89,13 @@ def parse():
         else:
             sys.stderr.write("\n\nRun took: %fs"%(t1-t0))
     else:
-        document = run(parseMethod, f, encoding)
+        document = run(parseMethod, f, encoding, opts.scripting)
         if document:
             printOutput(p, document, opts)
 
-def run(parseMethod, f, encoding):
+def run(parseMethod, f, encoding, scripting):
     try:
-        document = parseMethod(f, encoding=encoding)
+        document = parseMethod(f, encoding=encoding, scripting=scripting)
     except:
         document = None
         traceback.print_exc()
@@ -168,6 +169,9 @@ def getOptParser():
     parser.add_option("-f", "--fragment", action="store_true", default=False,
                       dest="fragment", help="Parse as a fragment")
 
+    parser.add_option("-s", "--scripting", action="store_true", default=False,
+                      dest="scripting", help="Handle noscript tags as if scripting was enabled")
+
     parser.add_option("", "--tree", action="store_true", default=False,
                       dest="tree", help="Output as debug tree")
 
