Commit6cb006a

committed

Make sure lxml unesacpes xml names properly

1 parent1442bad commit6cb006aCopy full SHA for 6cb006a

File tree

-9

lines changed

-9

lines changed

Lines changed: 3 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -72,18 +72,14 @@ def listToRegexpStr(charList):`
`72`	`72`	`rv= []`
`73`	`73`	`foritemincharList:`
`74`	`74`	`ifitem[0]==item[1]:`
`75`		`-rv.append(intToUnicodeStr(item[0]))`
	`75`	`+rv.append(unichar(item[0]))`
`76`	`76`	`else:`
`77`		`-rv.append(intToUnicodeStr(item[0])+"-"+intToUnicodeStr(item[1]))`
`78`		`-return"[%s]"%"\|".join(rv)`
	`77`	`+rv.append(unichar(item[0])+"-"+unichar(item[1]))`
	`78`	`+return"[%s]"%"".join(rv)`
`79`	`79`
`80`	`80`	`defhexToInt(hex_str):`
`81`	`81`	`returnint(hex_str,16)`
`82`	`82`
`83`		`-defintToUnicodeStr(intValue):`
`84`		`-#There must be a better (non-evil) way to do this`
`85`		`-returnescapeRegexp(eval(r"u'\u%s'"%hex(intValue)[2:].rjust(4,"0")))`
`86`		`-`
`87`	`83`	`defescapeRegexp(string):`
`88`	`84`	`specialCharacters= (".","^","$","*","+","?","{","}",`
`89`	`85`	`"[","]","\|","(",")","-")`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -203,12 +203,12 @@ def __init__(self, name, namespace):`
`203`	`203`	`self._attributes=Attributes(self)`
`204`	`204`
`205`	`205`	`def_setName(self,name):`
`206`		`-self._name=filter.coerceElement(name)`
	`206`	`+self._name=filter.coerceElement(name)`
`207`	`207`	`self._element.tag=self._getETreeTag(`
`208`	`208`	`self._name,self._namespace)`
`209`	`209`
`210`	`210`	`def_getName(self):`
`211`		`-returnself._name`
	`211`	`+returnfilter.fromXmlName(self._name)`
`212`	`212`
`213`	`213`	`name=property(_getName,_setName)`
`214`	`214`

Comments

(0)