Commitb0bec7d

committed

Merge

2 parents2225181 +9b24f76 commitb0bec7dCopy full SHA for b0bec7d

File tree

+16

-3

lines changed

+16

-3

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -907,7 +907,7 @@ def beforeAttributeValueState(self):`
`907`	`907`	`self.tokenQueue.append({"type":tokenTypes["ParseError"],"data":`
`908`	`908`	`"expected-attribute-value-but-got-right-bracket"})`
`909`	`909`	`self.emitCurrentToken()`
`910`		`-elifdatain (u"=",u"<"):`
	`910`	+elifdatain (u"=",u"<",u"`"):
`911`	`911`	`self.tokenQueue.append({"type":tokenTypes["ParseError"],"data":`
`912`	`912`	`"equals-in-unquoted-attribute-value"})`
`913`	`913`	`self.currentToken["data"][-1][1]+=data`
`@@ -968,8 +968,8 @@ def attributeValueUnQuotedState(self):`
`968`	`968`	`"eof-in-attribute-value-no-quotes"})`
`969`	`969`	`self.emitCurrentToken()`
`970`	`970`	`else:`
`971`		`-self.currentToken["data"][-1][1]+=data+self.stream.charsUntil( \`
`972`		`-frozenset(("&",">","<","=","'",'"'))\|spaceCharacters)`
	`971`	`+self.currentToken["data"][-1][1]+=data+self.stream.charsUntil(`
	`972`	+frozenset((u"&",u">",u'"',u"'",u"=",u"<",u"`"))\|spaceCharacters)
`973`	`973`	`returnTrue`
`974`	`974`
`975`	`975`	`defafterAttributeValueState(self):`

Lines changed: 13 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -73,6 +73,19 @@ def getTreeBuilder(treeType, implementation=None, **kwargs):`
`73`	`73`	`importetree_lxml`
`74`	`74`	`treeBuilderCache[treeType]=etree_lxml.TreeBuilder`
`75`	`75`	`eliftreeType=="etree":`
	`76`	`+# Come up with a sane default`
	`77`	`+ifimplementation==None:`
	`78`	`+try:`
	`79`	`+importxml.etree.cElementTreeasET`
	`80`	`+exceptImportError:`
	`81`	`+try:`
	`82`	`+importxml.etree.ElementTreeasET`
	`83`	`+exceptImportError:`
	`84`	`+try:`
	`85`	`+importcElementTreeasET`
	`86`	`+exceptImportError:`
	`87`	`+importelementtree.ElementTreeasET`
	`88`	`+implementation=ET`
`76`	`89`	`importetree`
`77`	`90`	`# XXX: NEVER cache here, caching is done in the etree submodule`
`78`	`91`	`returnetree.getETreeModule(implementation,**kwargs).TreeBuilder`

Comments

(0)