Commit11bdb49

authored and

committed

Make self closing col start tags not cause a parse error (html5lib#244)

1 parentfbce67d commit11bdb49Copy full SHA for 11bdb49

File tree

+13

-3

lines changed

+13

-3

lines changed

Lines changed: 1 addition & 0 deletions

Lines changed: 6 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -171,8 +171,10 @@ def mainLoop(self):`
`171`	`171`	`ParseErrorToken=tokenTypes["ParseError"]`
`172`	`172`
`173`	`173`	`fortokeninself.normalizedTokens():`
	`174`	`+prev_token=None`
`174`	`175`	`new_token=token`
`175`	`176`	`whilenew_tokenisnotNone:`
	`177`	`+prev_token=new_token`
`176`	`178`	`currentNode=self.tree.openElements[-1]ifself.tree.openElementselseNone`
`177`	`179`	`currentNodeNamespace=currentNode.namespaceifcurrentNodeelseNone`
`178`	`180`	`currentNodeName=currentNode.nameifcurrentNodeelseNone`
`@@ -211,10 +213,10 @@ def mainLoop(self):`
`211`	`213`	`eliftype==DoctypeToken:`
`212`	`214`	`new_token=phase.processDoctype(new_token)`
`213`	`215`
`214`		`-if (type==StartTagTokenandtoken["selfClosing"]and`
`215`		`-nottoken["selfClosingAcknowledged"]):`
	`216`	`+if (type==StartTagTokenandprev_token["selfClosing"]and`
	`217`	`+notprev_token["selfClosingAcknowledged"]):`
`216`	`218`	`self.parseError("non-void-element-with-trailing-solidus",`
`217`		`- {"name":token["name"]})`
	`219`	`+ {"name":prev_token["name"]})`
`218`	`220`
`219`	`221`	`# When the loop finishes it's EOF`
`220`	`222`	`reprocess=True`
`@@ -1933,6 +1935,7 @@ def processCharacters(self, token):`
`1933`	`1935`	`defstartTagCol(self,token):`
`1934`	`1936`	`self.tree.insertElement(token)`
`1935`	`1937`	`self.tree.openElements.pop()`
	`1938`	`+token["selfClosingAcknowledged"]=True`
`1936`	`1939`
`1937`	`1940`	`defstartTagOther(self,token):`
`1938`	`1941`	`ignoreEndTag=self.ignoreEndTagColgroup()`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -93,3 +93,9 @@ def test_debug_log():`
`93`	`93`	`deftest_no_duplicate_clone():`
`94`	`94`	`frag=parseFragment("<b><em><foo><foob><fooc><aside></b></em>")`
`95`	`95`	`assertlen(frag)==2`
	`96`	`+`
	`97`	`+`
	`98`	`+deftest_self_closing_col():`
	`99`	`+parser=HTMLParser()`
	`100`	`+parser.parseFragment('<table><colgroup><col /></colgroup></table>')`
	`101`	`+assertnotparser.errors`

Comments

(0)