Commited014f6

committed

Get tests running cleanly with -3

1 parentdf16775 commited014f6Copy full SHA for ed014f6

File tree

+11

-5

lines changed

+11

-5

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -166,12 +166,12 @@ def sanitize_token(self, token):`
`166`	`166`	`iftoken_typein (tokenTypes["StartTag"],tokenTypes["EndTag"],`
`167`	`167`	`tokenTypes["EmptyTag"]):`
`168`	`168`	`iftoken["name"]inself.allowed_elements:`
`169`		`-iftoken.has_key("data"):`
	`169`	`+if"data"intoken:`
`170`	`170`	`attrs=dict([(name,val)forname,valin`
`171`	`171`	`token["data"][::-1]`
`172`	`172`	`ifnameinself.allowed_attributes])`
`173`	`173`	`forattrinself.attr_val_is_uri:`
`174`		`-ifnotattrs.has_key(attr):`
	`174`	`+ifattrnotinattrs:`
`175`	`175`	`continue`
`176`	`176`	val_unescaped=re.sub("[`\000-\040\177-\240\s]+",'',
`177`	`177`	`unescape(attrs[attr])).lower()`
`@@ -190,7 +190,7 @@ def sanitize_token(self, token):`
`190`	`190`	`'xlink:href'inattrsandre.search('^\s[^#\s].',`
`191`	`191`	`attrs['xlink:href'])):`
`192`	`192`	`delattrs['xlink:href']`
`193`		`-ifattrs.has_key('style'):`
	`193`	`+if'style'inattrs:`
`194`	`194`	`attrs['style']=self.sanitize_css(attrs['style'])`
`195`	`195`	`token["data"]= [[name,val]forname,valinattrs.items()]`
`196`	`196`	`returntoken`

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,12 @@`
`4`	`4`	`# Import from the sets module for python 2.3`
`5`	`5`	`fromsetsimportImmutableSetasfrozenset`
`6`	`6`
	`7`	`+try:`
	`8`	`+# use functools.reduce to avoid DeprecationWarning with -3`
	`9`	`+fromfunctoolsimportreduce`
	`10`	`+exceptImportError:`
	`11`	`+pass`
	`12`	`+`
`7`	`13`	`importgettext`
`8`	`14`	`_=gettext.gettext`
`9`	`15`
`@@ -150,7 +156,7 @@ def __init__(self, **kwargs):`
`150`	`156`
`151`	`157`	`.. _html5lib user documentation: http://code.google.com/p/html5lib/wiki/UserDocumentation`
`152`	`158`	`"""`
`153`		`-ifkwargs.has_key('quote_char'):`
	`159`	`+if'quote_char'inkwargs:`
`154`	`160`	`self.use_best_quote_char=False`
`155`	`161`	`forattrinself.options:`
`156`	`162`	`setattr(self,attr,kwargs.get(attr,getattr(self,attr)))`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ def tokensMatch(expectedTokens, receivedTokens, ignoreErrorOrder,`
`124`	`124`
`125`	`125`	`defunescape_test(test):`
`126`	`126`	`defdecode(inp):`
`127`		`-returninp.decode("unicode-escape")`
	`127`	`+returninp.encode("utf-8").decode("unicode-escape")`
`128`	`128`
`129`	`129`	`test["input"]=decode(test["input"])`
`130`	`130`	`fortokenintest["output"]:`

Comments

(0)