diff options
| author | Josh Matthews <josh@joshmatthews.net> | 2016-10-07 00:57:07 -0400 |
|---|---|---|
| committer | Josh Matthews <josh@joshmatthews.net> | 2016-10-18 09:11:47 -0400 |
| commit | a9c2dda2997e18d691f0e6727cf65e52a1173f21 (patch) | |
| tree | 9745460cc4fd754a3983838dd4a2e5d9fcf80dd3 | |
| parent | d6318c8ea5dc3c8e249631973a444ba95310c676 (diff) | |
| download | servo-a9c2dda2997e18d691f0e6727cf65e52a1173f21.tar.gz servo-a9c2dda2997e18d691f0e6727cf65e52a1173f21.zip | |
Revert wptrunner 496353104e7ee0969e316c12caf3dc2988efb8e8
| -rw-r--r-- | tests/wpt/harness/wptrunner/wptmanifest/parser.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/tests/wpt/harness/wptrunner/wptmanifest/parser.py b/tests/wpt/harness/wptrunner/wptmanifest/parser.py index 58196e57ae1..eeac66d3180 100644 --- a/tests/wpt/harness/wptrunner/wptmanifest/parser.py +++ b/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 @@ atoms = {"True": True, "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 @@ class Tokenizer(object): value += self.escape_value(c) self.consume() - return unichr(value) + return unichr(value).encode("utf8") def escape_value(self, c): if '0' <= c <= '9': |