Commit2d37673

committed

Fixhtml5lib#228: make sure the lxml treewalker works with trees from lxml (html5lib#256)

r=nobody!

1 parent66a2f77 commit2d37673Copy full SHA for 2d37673

File tree

+39

-11

lines changed

+39

-11

lines changed

Lines changed: 21 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,11 @@`
`2`	`2`
`3`	`3`	`importpytest`
`4`	`4`
	`5`	`+try:`
	`6`	`+importlxml.etree`
	`7`	`+exceptImportError:`
	`8`	`+pass`
	`9`	`+`
`5`	`10`	`from .supportimporttreeTypes`
`6`	`11`
`7`	`12`	`fromhtml5libimporthtml5parser,treewalkers`
`@@ -93,3 +98,19 @@ def test_treewalker_six_mix():`
`93`	`98`	`fortreeinsorted(treeTypes.items()):`
`94`	`99`	`forintext,attrs,expectedinsm_tests:`
`95`	`100`	`yieldrunTreewalkerEditTest,intext,expected,attrs,tree`
	`101`	`+`
	`102`	`+`
	`103`	`+@pytest.mark.skipif(treeTypes["lxml"]isNone,reason="lxml not importable")`
	`104`	`+deftest_lxml_xml():`
	`105`	`+expected= [`
	`106`	`+ {'data': {},'name':'div','namespace':None,'type':'StartTag'},`
	`107`	`+ {'data': {},'name':'div','namespace':None,'type':'StartTag'},`
	`108`	`+ {'name':'div','namespace':None,'type':'EndTag'},`
	`109`	`+ {'name':'div','namespace':None,'type':'EndTag'}`
	`110`	`+ ]`
	`111`	`+`
	`112`	`+lxmltree=lxml.etree.fromstring('<div><div></div></div>')`
	`113`	`+walker=treewalkers.getTreeWalker('lxml')`
	`114`	`+output=Lint(walker(lxmltree))`
	`115`	`+`
	`116`	`+assertlist(output)==expected`

Lines changed: 18 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -22,13 +22,20 @@ class Root(object):`
`22`	`22`	`def__init__(self,et):`
`23`	`23`	`self.elementtree=et`
`24`	`24`	`self.children= []`
`25`		`-ifet.docinfo.internalDTD:`
`26`		`-self.children.append(Doctype(self,`
`27`		`-ensure_str(et.docinfo.root_name),`
`28`		`-ensure_str(et.docinfo.public_id),`
`29`		`-ensure_str(et.docinfo.system_url)))`
`30`		`-root=et.getroot()`
`31`		`-node=root`
	`25`	`+`
	`26`	`+try:`
	`27`	`+ifet.docinfo.internalDTD:`
	`28`	`+self.children.append(Doctype(self,`
	`29`	`+ensure_str(et.docinfo.root_name),`
	`30`	`+ensure_str(et.docinfo.public_id),`
	`31`	`+ensure_str(et.docinfo.system_url)))`
	`32`	`+exceptAttributeError:`
	`33`	`+pass`
	`34`	`+`
	`35`	`+try:`
	`36`	`+node=et.getroot()`
	`37`	`+exceptAttributeError:`
	`38`	`+node=et`
`32`	`39`
`33`	`40`	`whilenode.getprevious()isnotNone:`
`34`	`41`	`node=node.getprevious()`
`@@ -118,12 +125,12 @@ def __len__(self):`
`118`	`125`	`classTreeWalker(_base.NonRecursiveTreeWalker):`
`119`	`126`	`def__init__(self,tree):`
`120`	`127`	`# pylint:disable=redefined-variable-type`
`121`		`-ifhasattr(tree,"getroot"):`
`122`		`-self.fragmentChildren=set()`
`123`		`-tree=Root(tree)`
`124`		`-elifisinstance(tree,list):`
	`128`	`+ifisinstance(tree,list):`
`125`	`129`	`self.fragmentChildren=set(tree)`
`126`	`130`	`tree=FragmentRoot(tree)`
	`131`	`+else:`
	`132`	`+self.fragmentChildren=set()`
	`133`	`+tree=Root(tree)`
`127`	`134`	`_base.NonRecursiveTreeWalker.__init__(self,tree)`
`128`	`135`	`self.filter=ihatexml.InfosetFilter()`
`129`	`136`

Comments

(0)