Get tests running cleanly with -3

gsnedders · gsnedders · commit ed014f6263d6 · 2012-05-19T21:48:48.000+01:00
diff --git a/html5lib/sanitizer.py b/html5lib/sanitizer.py
@@ -166,12 +166,12 @@ def sanitize_token(self, token):
         if token_type in (tokenTypes["StartTag"], tokenTypes["EndTag"], 
                              tokenTypes["EmptyTag"]):
             if token["name"] in self.allowed_elements:
-                if token.has_key("data"):
+                if "data" in token:
                     attrs = dict([(name,val) for name,val in
                                   token["data"][::-1] 
                                   if name in self.allowed_attributes])
                     for attr in self.attr_val_is_uri:
-                        if not attrs.has_key(attr):
+                        if attr not in attrs:
                             continue
                         val_unescaped = re.sub("[`\000-\040\177-\240\s]+", '',
                                                unescape(attrs[attr])).lower()
@@ -190,7 +190,7 @@ def sanitize_token(self, token):
                         'xlink:href' in attrs and re.search('^\s*[^#\s].*',
                                                             attrs['xlink:href'])):
                         del attrs['xlink:href']
-                    if attrs.has_key('style'):
+                    if 'style' in attrs:
                         attrs['style'] = self.sanitize_css(attrs['style'])
                     token["data"] = [[name,val] for name,val in attrs.items()]
                 return token
diff --git a/html5lib/serializer/htmlserializer.py b/html5lib/serializer/htmlserializer.py
@@ -4,6 +4,12 @@
     # Import from the sets module for python 2.3
     from sets import ImmutableSet as frozenset
 
+try:
+    # use functools.reduce to avoid DeprecationWarning with -3
+    from functools import reduce
+except ImportError:
+    pass
+
 import gettext
 _ = gettext.gettext
 
@@ -150,7 +156,7 @@ def __init__(self, **kwargs):
 
         .. _html5lib user documentation: http://code.google.com/p/html5lib/wiki/UserDocumentation
         """
-        if kwargs.has_key('quote_char'):
+        if 'quote_char' in kwargs:
             self.use_best_quote_char = False
         for attr in self.options:
             setattr(self, attr, kwargs.get(attr, getattr(self, attr)))
diff --git a/html5lib/tests/test_tokenizer.py b/html5lib/tests/test_tokenizer.py
@@ -124,7 +124,7 @@ def tokensMatch(expectedTokens, receivedTokens, ignoreErrorOrder,
 
 def unescape_test(test):
     def decode(inp):
-        return inp.decode("unicode-escape")
+        return inp.encode("utf-8").decode("unicode-escape")
 
     test["input"] = decode(test["input"])
     for token in test["output"]:
