Commit945911b

authored

Fix parse.py afterhtml5lib#257 (html5lib#271)

1 parent699276b commit945911bCopy full SHA for 945911b

File tree

1 file changed

-12

lines changed

parse.py

1 file changed

-12

lines changed

`‎parse.py`

Lines changed: 4 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@`
`9`	`9`	`fromoptparseimportOptionParser`
`10`	`10`
`11`	`11`	`fromhtml5libimporthtml5parser`
`12`		`-fromhtml5lib.tokenizerimportHTMLTokenizer`
`13`	`12`	`fromhtml5libimporttreebuilders,serializer,treewalkers`
`14`	`13`	`fromhtml5libimportconstants`
`15`	`14`	`fromhtml5libimportutils`
`@@ -53,9 +52,7 @@ def parse():`
`53`	`52`
`54`	`53`	`treebuilder=treebuilders.getTreeBuilder(opts.treebuilder)`
`55`	`54`
`56`		`-tokenizer=HTMLTokenizer`
`57`		`-`
`58`		`-p=html5parser.HTMLParser(tree=treebuilder,tokenizer=tokenizer,debug=opts.log)`
	`55`	`+p=html5parser.HTMLParser(tree=treebuilder,debug=opts.log)`
`59`	`56`
`60`	`57`	`ifopts.fragment:`
`61`	`58`	`parseMethod=p.parseFragment`
`@@ -96,7 +93,7 @@ def parse():`
`96`	`93`
`97`	`94`	`defrun(parseMethod,f,encoding,scripting):`
`98`	`95`	`try:`
`99`		`-document=parseMethod(f,encoding=encoding,scripting=scripting)`
	`96`	`+document=parseMethod(f,override_encoding=encoding,scripting=scripting)`
`100`	`97`	`except:`
`101`	`98`	`document=None`
`102`	`99`	`traceback.print_exc()`
`@@ -117,16 +114,14 @@ def printOutput(parser, document, opts):`
`117`	`114`	`document.writexml(sys.stdout,encoding="utf-8")`
`118`	`115`	`eliftb=="lxml":`
`119`	`116`	`importlxml.etree`
`120`		`-sys.stdout.write(lxml.etree.tostring(document))`
	`117`	`+sys.stdout.write(lxml.etree.tostring(document,encoding="unicode"))`
`121`	`118`	`eliftb=="etree":`
`122`		`-sys.stdout.write(utils.default_etree.tostring(document))`
	`119`	`+sys.stdout.write(utils.default_etree.tostring(document,encoding="unicode"))`
`123`	`120`	`elifopts.tree:`
`124`	`121`	`ifnothasattr(document,'__getitem__'):`
`125`	`122`	`document= [document]`
`126`	`123`	`forfragmentindocument:`
`127`	`124`	`print(parser.tree.testSerializer(fragment))`
`128`		`-elifopts.hilite:`
`129`		`-sys.stdout.write(document.hilite("utf-8"))`
`130`	`125`	`elifopts.html:`
`131`	`126`	`kwargs= {}`
`132`	`127`	`foroptinserializer.HTMLSerializer.options:`
`@@ -188,9 +183,6 @@ def getOptParser():`
`188`	`183`	`parser.add_option("","--no-html",action="store_false",default=True,`
`189`	`184`	`dest="html",help="Don't output html")`
`190`	`185`
`191`		`-parser.add_option("","--hilite",action="store_true",default=False,`
`192`		`-dest="hilite",help="Output as formatted highlighted code.")`
`193`		`-`
`194`	`186`	`parser.add_option("-c","--encoding",action="store_true",default=False,`
`195`	`187`	`dest="encoding",help="Print character encoding used")`
`196`	`188`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit945911b

File tree

1 file changed

1 file changed

`‎parse.py`

0 commit comments