Revert wptrunner 496353104e7ee0969e316c12caf3dc2988efb8e8

tests/wpt/harness/wptrunner/wptmanifest/parser.py

@@ -16,8 +16,6 @@
 
 # TODO: keep comments in the tree
 
-from __future__ import unicode_literals
-
 import types
 from cStringIO import StringIO
 
@@ -50,9 +48,8 @@ def __init__(self, filename, line, detail):
          "False": False,
          "Reset": object()}
 
-def decode(s):
-    assert isinstance(s, unicode)
-    return s
+def decode(byte_str):
+    return byte_str.decode("utf8")
 
 
 def precedence(operator_node):
@@ -477,7 +474,7 @@ def decode_escape(self, length):
             value += self.escape_value(c)
             self.consume()
 
-        return unichr(value)
+        return unichr(value).encode("utf8")
 
     def escape_value(self, c):
         if '0' <= c <= '9':