| Index: third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/wptserve/wptserve/pipes.py
|
| diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/wptserve/wptserve/pipes.py b/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/wptserve/wptserve/pipes.py
|
| index 95108ba7e93df74901fbbc8cd2114635b064711d..41f7dd33e26637c2c83591bfcfd94708134e87e3 100644
|
| --- a/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/wptserve/wptserve/pipes.py
|
| +++ b/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/wptserve/wptserve/pipes.py
|
| @@ -8,7 +8,10 @@
|
|
|
|
|
| def resolve_content(response):
|
| - return b"".join(item for item in response.iter_content(read_file=True))
|
| + rv = "".join(item for item in response.iter_content(read_file=True))
|
| + if type(rv) == unicode:
|
| + rv = rv.encode(response.encoding)
|
| + return rv
|
|
|
|
|
| class Pipeline(object):
|
|
|