Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1118)

Unified Diff: third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/wptserve/wptserve/pipes.py

Issue 2476653002: wptserve: Import the latest revision of wptserve-related files. (Closed)
Patch Set: Add six Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 41f7dd33e26637c2c83591bfcfd94708134e87e3..95108ba7e93df74901fbbc8cd2114635b064711d 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,10 +8,7 @@ from cStringIO import StringIO
def resolve_content(response):
- rv = "".join(item for item in response.iter_content(read_file=True))
- if type(rv) == unicode:
- rv = rv.encode(response.encoding)
- return rv
+ return b"".join(item for item in response.iter_content(read_file=True))
class Pipeline(object):

Powered by Google App Engine
This is Rietveld 408576698