third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/base.py - Issue 2633753003: [Android] Stop using universal_newlines in the layout tests server constructor. (RELAND)

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/base.py

Issue 2633753003: [Android] Stop using universal_newlines in the layout tests server constructor. (RELAND) (Closed)

Patch Set: accept unicode and str objects Created 3 years, 11 months 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

« no previous file with comments | « third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/android.py ('k') | third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/server_process.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/base.py

diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/base.py b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/base.py

index 7f0bed839f1a5f094545421e68169e39ff91b7a6..52d406462b552a3308a96346dbf3c64bfd9a3086 100644

--- a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/base.py

+++ b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/base.py

@@ -1465,12 +1465,12 @@ class Port(object):

# We require stdout and stderr to be bytestrings, not character strings.

if stdout:

- assert isinstance(stdout, str)

+ assert isinstance(stdout, basestring)

stdout_lines = stdout.decode('utf8', 'replace').splitlines()

else:

stdout_lines = [u'<empty>']

if stderr:

- assert isinstance(stderr, str)

+ assert isinstance(stderr, basestring)

stderr_lines = stderr.decode('utf8', 'replace').splitlines()

else:

stderr_lines = [u'<empty>']