build/android/pylib/android_commands.py - Issue 371813005: [Android] Switch to DeviceUtils versions of Ls, SetJavaAsserts, GetProp, and SetProp.

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: build/android/pylib/android_commands.py

Issue 371813005: [Android] Switch to DeviceUtils versions of Ls, SetJavaAsserts, GetProp, and SetProp. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 5 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

Index: build/android/pylib/android_commands.py

diff --git a/build/android/pylib/android_commands.py b/build/android/pylib/android_commands.py

index 3d13f196a6f9a45aaede3df6e4bba747c9d1afd1..c77ea650b079d556075420d12539417309f8b652 100644

--- a/build/android/pylib/android_commands.py

+++ b/build/android/pylib/android_commands.py

@@ -1230,7 +1230,7 @@ class AndroidCommands(object):

"""

# Example output:

# /foo/bar:

- # -rw-r----- 1 user group 102 2011-05-12 12:29:54.131623387 +0100 baz.txt

+ # -rw-r----- user group 102 2011-05-12 12:29:54.131623387 +0100 baz.txt

re_file = re.compile('^-(?P<perms>[^\s]+)\s+'

'(?P<user>[^\s]+)\s+'

'(?P<group>[^\s]+)\s+'

@@ -1260,7 +1260,8 @@ class AndroidCommands(object):

temp_props_file = tempfile.NamedTemporaryFile()

properties = ''

if self._adb.Pull(LOCAL_PROPERTIES_PATH, temp_props_file.name):

- properties = file(temp_props_file.name).read()

+ with open(temp_props_file.name) as f:

+ properties = f.read()

re_search = re.compile(r'^\s*' + re.escape(JAVA_ASSERT_PROPERTY) +

r'\s*=\s*all\s*$', re.MULTILINE)

if enable != bool(re.search(re_search, properties)):

« no previous file with comments | « build/android/enable_asserts.py ('k') | build/android/pylib/content_settings.py » ('j') | no next file with comments »