Commit6ddce87

committed

Lint serializer test input; fix broken examples

1 parentda12b01 commit6ddce87Copy full SHA for 6ddce87

File tree

+11

-23

lines changed

+11

-23

lines changed

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,10 @@`
`10`	`10`
`11`	`11`
`12`	`12`	`classFilter(_base.Filter):`
	`13`	`+def__init__(self,source,require_matching_tags=True):`
	`14`	`+super(Filter,self).__init__(source)`
	`15`	`+self.require_matching_tags=require_matching_tags`
	`16`	`+`
`13`	`17`	`def__iter__(self):`
`14`	`18`	`open_elements= []`
`15`	`19`	`fortokenin_base.Filter.__iter__(self):`
`@@ -26,7 +30,7 @@ def __iter__(self):`
`26`	`30`	`asserttype=="EmptyTag"`
`27`	`31`	`else:`
`28`	`32`	`asserttype=="StartTag"`
`29`		`-iftype=="StartTag":`
	`33`	`+iftype=="StartTag"andself.require_matching_tags:`
`30`	`34`	`open_elements.append((namespace,name))`
`31`	`35`	`for (namespace,name),valueintoken["data"].items():`
`32`	`36`	`assertnamespaceisNoneorisinstance(namespace,text_type)`
`@@ -44,7 +48,7 @@ def __iter__(self):`
`44`	`48`	`assertname!=""`
`45`	`49`	`if (notnamespaceornamespace==namespaces["html"])andnameinvoidElements:`
`46`	`50`	`assertFalse,"Void element reported as EndTag token: %(tag)s"% {"tag":name}`
`47`		`-else:`
	`51`	`+elifself.require_matching_tags:`
`48`	`52`	`start=open_elements.pop()`
`49`	`53`	`assertstart== (namespace,name)`
`50`	`54`

Lines changed: 0 additions & 14 deletions

Original file line number	Diff line number	Diff line change
`@@ -293,20 +293,6 @@`
`293`	`293`	`],`
`294`	`294`	`"description": "void element (as EmptyTag token)"`
`295`	`295`	`},`
`296`		`- {`
`297`		`- "expected": [`
`298`		`- "<img>"`
`299`		`- ],`
`300`		`- "input": [`
`301`		`- [`
`302`		`- "StartTag",`
`303`		`- "http://www.w3.org/1999/xhtml",`
`304`		`- "img",`
`305`		`- {}`
`306`		`- ]`
`307`		`- ],`
`308`		`- "description": "void element (as StartTag token)"`
`309`		`- },`
`310`	`296`	`{`
`311`	`297`	`"expected": [`
`312`	`298`	`"<!DOCTYPE foo>"`

Lines changed: 3 additions & 3 deletions

Lines changed: 2 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`
`14`	`14`	`importhtml5lib`
`15`	`15`	`fromhtml5libimportconstants`
	`16`	`+fromhtml5lib.filters.lintimportFilterasLint`
`16`	`17`	`fromhtml5lib.serializerimportHTMLSerializer,serialize`
`17`	`18`	`fromhtml5lib.treewalkers._baseimportTreeWalker`
`18`	`19`
`@@ -83,7 +84,7 @@ def _convertAttrib(self, attribs):`
`83`	`84`
`84`	`85`	`defserialize_html(input,options):`
`85`	`86`	`options=dict([(str(k),v)fork,vinoptions.items()])`
`86`		`-stream=JsonWalker(input)`
	`87`	`+stream=Lint(JsonWalker(input),False)`
`87`	`88`	`serializer=HTMLSerializer(alphabetical_attributes=True,**options)`
`88`	`89`	`returnserializer.render(stream,options.get("encoding",None))`
`89`	`90`
`@@ -125,9 +126,6 @@ def testCharacters(self):`
`125`	`126`	`deftestStartTagName(self):`
`126`	`127`	`self.throwsWithLatin1([["StartTag","http://www.w3.org/1999/xhtml","\u0101", []]])`
`127`	`128`
`128`		`-deftestEmptyTagName(self):`
`129`		`-self.throwsWithLatin1([["EmptyTag","http://www.w3.org/1999/xhtml","\u0101", []]])`
`130`		`-`
`131`	`129`	`deftestAttributeName(self):`
`132`	`130`	`self.throwsWithLatin1([["StartTag","http://www.w3.org/1999/xhtml","span", [{"namespace":None,"name":"\u0101","value":"potato"}]]])`
`133`	`131`

Comments

(0)