LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Python 3 compatibility.

Browse Source 
Test: ndk/run_tests.py
Bug: None
Change-Id: Id0d2d8024adec880c1a41b524704df1641cda065
This commit is contained in:
Dan Albert
2018-02-14 12:46:31 -08:00
parent 2cfca9462e
commit 1b06c6e40d
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
python-packages/adb/device.py
View File

@@ -51,7 +51,8 @@ def get_devices(adb_path='adb'):
with open(os.devnull, 'wb') as devnull: with open(os.devnull, 'wb') as devnull:
subprocess.check_call([adb_path, 'start-server'], stdout=devnull, subprocess.check_call([adb_path, 'start-server'], stdout=devnull,
stderr=devnull) stderr=devnull)
out = split_lines(subprocess.check_output([adb_path, 'devices'])) out = split_lines(
subprocess.check_output([adb_path, 'devices']).decode('utf-8'))
# The first line of `adb devices` just says "List of attached devices", so # The first line of `adb devices` just says "List of attached devices", so
# skip that. # skip that.
@@ -118,7 +119,7 @@ def _get_device_by_type(flag, adb_path):
stderr=devnull) stderr=devnull)
try: try:
serial = subprocess.check_output( serial = subprocess.check_output(
[adb_path, flag, 'get-serialno']).strip() [adb_path, flag, 'get-serialno']).decode('utf-8').strip()
except subprocess.CalledProcessError: except subprocess.CalledProcessError:
raise RuntimeError('adb unexpectedly returned nonzero') raise RuntimeError('adb unexpectedly returned nonzero')
if serial == 'unknown': if serial == 'unknown':
@@ -233,6 +234,7 @@ def version(adb_path=None):
adb_path = adb_path if adb_path is not None else ['adb'] adb_path = adb_path if adb_path is not None else ['adb']
version_output = subprocess.check_output(adb_path + ['version']) version_output = subprocess.check_output(adb_path + ['version'])
version_output = version_output.decode('utf-8')
pattern = r'^Android Debug Bridge version 1.0.(\d+)$' pattern = r'^Android Debug Bridge version 1.0.(\d+)$'
result = re.match(pattern, version_output.splitlines()[0]) result = re.match(pattern, version_output.splitlines()[0])
if not result: if not result:
@@ -273,8 +275,8 @@ class AndroidDevice(object):
@property @property
def linesep(self): def linesep(self):
if self._linesep is None: if self._linesep is None:
self._linesep = subprocess.check_output(self.adb_cmd + self._linesep = subprocess.check_output(
['shell', 'echo']) self.adb_cmd + ['shell', 'echo']).decode('utf-8')
return self._linesep return self._linesep
@property @property
@@ -326,7 +328,7 @@ class AndroidDevice(object):
def _simple_call(self, cmd): def _simple_call(self, cmd):
logging.info(' '.join(self.adb_cmd + cmd)) logging.info(' '.join(self.adb_cmd + cmd))
return _subprocess_check_output( return _subprocess_check_output(
self.adb_cmd + cmd, stderr=subprocess.STDOUT) self.adb_cmd + cmd, stderr=subprocess.STDOUT).decode('utf-8')
def shell(self, cmd): def shell(self, cmd):
"""Calls `adb shell` """Calls `adb shell`
@@ -361,6 +363,8 @@ class AndroidDevice(object):
p = _subprocess_Popen( p = _subprocess_Popen(
cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
stdout, stderr = p.communicate() stdout, stderr = p.communicate()
stdout = stdout.decode('utf-8')
stderr = stderr.decode('utf-8')
if self.has_shell_protocol(): if self.has_shell_protocol():
exit_code = p.returncode exit_code = p.returncode
else: else: