commit 17de6ce9ceedab3f95e8257fe648283e54ece0f5
author Elliott Hughes <enh@google.com> Wed Jun 23 18:00:46 2021 -0700
committer Elliott Hughes <enh@google.com> Wed Jun 23 18:04:27 2021 -0700
tree 70addd18e08e8146c60754eae8976bf9f58c5c40
parent f051c6f342d11263eb5e56bf224a8409dfcf0e1d

Fix gdbclient to work with Python 3.

Test: gdbclient.py -r date
Change-Id: I10616c197dd50fe653e56c2e4c39e2371445c72b

python-packages/gdbrunner/__init__.py

diff --git a/python-packages/gdbrunner/__init__.py b/python-packages/gdbrunner/__init__.py
index b69069d..4446fcb 100644
--- a/python-packages/gdbrunner/__init__.py
+++ b/python-packages/gdbrunner/__init__.py
@@ -197,7 +197,7 @@
         gdbserver_output_path = os.path.join(tempfile.gettempdir(),
                                              "gdbclient.log")
         print("Redirecting gdbserver output to {}".format(gdbserver_output_path))
-    gdbserver_output = file(gdbserver_output_path, 'w')
+    gdbserver_output = open(gdbserver_output_path, 'w')
     return device.shell_popen(gdbserver_cmd, stdout=gdbserver_output,
                               stderr=gdbserver_output)
 
@@ -275,7 +275,7 @@
 
     for path, found_locally in generate_files():
         if os.path.isfile(path):
-            return (open(path, "r"), found_locally)
+            return (open(path, "rb"), found_locally)
     raise RuntimeError('Could not find executable {}'.format(executable_path))
 
 def find_executable_path(device, executable_name, run_as_cmd=None):
@@ -318,14 +318,14 @@
         binary = binary_file.read(0x14)
     except IOError:
         raise RuntimeError("failed to read binary file")
-    ei_class = ord(binary[0x4]) # 1 = 32-bit, 2 = 64-bit
-    ei_data = ord(binary[0x5]) # Endianness
+    ei_class = binary[0x4] # 1 = 32-bit, 2 = 64-bit
+    ei_data = binary[0x5] # Endianness
 
     assert ei_class == 1 or ei_class == 2
     if ei_data != 1:
         raise RuntimeError("binary isn't little-endian?")
 
-    e_machine = ord(binary[0x13]) << 8 | ord(binary[0x12])
+    e_machine = binary[0x13] << 8 | binary[0x12]
     if e_machine == 0x28:
         assert ei_class == 1
         return "arm"
@@ -338,11 +338,6 @@
     elif e_machine == 0x3E:
         assert ei_class == 2
         return "x86_64"
-    elif e_machine == 0x08:
-        if ei_class == 1:
-            return "mips"
-        else:
-            return "mips64"
     else:
         raise RuntimeError("unknown architecture: 0x{:x}".format(e_machine))
 
@@ -368,7 +363,7 @@
 
     # Windows disallows opening the file while it's open for writing.
     script_fd, script_path = tempfile.mkstemp()
-    os.write(script_fd, gdb_commands)
+    os.write(script_fd, gdb_commands.encode())
     os.close(script_fd)
     if lldb:
         script_parameter = "--source"

scripts/gdbclient.py

diff --git a/scripts/gdbclient.py b/scripts/gdbclient.py
index 61fac40..5d4475a 100755
--- a/scripts/gdbclient.py
+++ b/scripts/gdbclient.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Copyright (C) 2015 The Android Open Source Project
 #