Merge pull request #11921 from madchutney/tools/py3-fixes

Updates to tools for Python 3 compatibility

Author: 0xc0170

tools/device_management.py

@@ -115,11 +115,11 @@ def inner(options):
         # Get the currently in-use API key (may come from environment or
         # configuration files, which is handled by the cloud SDK)
         api_key_value = accounts.config.get("api_key")
-        api_key = accounts.list_api_keys(
+        api_key = next(accounts.list_api_keys(
             filter={
                 "key": api_key_value
             }
-        ).next()
+        ))
         certificates_owned = list(certs.list_certificates())
         dev_cert_info = None
         for certif in certificates_owned:

tools/export/exporters.py

@@ -28,6 +28,7 @@
 from tools.targets import TARGET_MAP
 from tools.utils import mkdir
 from tools.resources import FileType, FileRef
+from future.utils import with_metaclass
 
 """Just a template for subclassing"""
 
@@ -57,14 +58,13 @@ def __init__(*args, **kwargs):
     CLS.NAME = "%s (DEPRECATED)" % old_name
     return CLS
 
-class Exporter(object):
+class Exporter(with_metaclass(ABCMeta, object)):
     """Exporter base class
 
     This class is meant to be extended by individual exporters, and provides a
     few helper methods for implementing an exporter with either jinja2 or
     progen.
     """
-    __metaclass__ = ABCMeta
     TEMPLATE_DIR = dirname(__file__)
     DOT_IN_RELATIVE_PATH = False
     NAME = None

tools/flash_algo/__init__.py

@@ -134,7 +134,7 @@ def format_algo_data(self, spaces, group_size, fmt):
             blob = self.algo_data[:]
             pad_size = 0 if len(blob) % 4 == 0 else 4 - len(blob) % 4
             blob = blob + "\x00" * pad_size
-            integer_list = struct.unpack("<" + "L" * (len(blob) / 4), blob)
+            integer_list = struct.unpack("<" + "L" * (len(blob) // 4), blob)
             line_list = []
             for pos in range(0, len(integer_list), group_size):
                 group = ["0x%08x" % value for value in

tools/host_tests/default_auto.py

@@ -18,7 +18,7 @@
 
 from sys import stdout
 
-class DefaultAuto():
+class DefaultAuto(object):
     """ Simple, basic host test's test runner waiting for serial port
         output from MUT, no supervision over test running in MUT is executed.
     """

tools/host_tests/detect_auto.py

@@ -17,7 +17,7 @@
 
 import re
 
-class DetectPlatformTest():
+class DetectPlatformTest(object):
     PATTERN_MICRO_NAME = "Target '(\w+)'"
     re_detect_micro_name = re.compile(PATTERN_MICRO_NAME)
 

tools/host_tests/dev_null_auto.py

@@ -15,7 +15,7 @@
 limitations under the License.
 """
 
-class DevNullTest():
+class DevNullTest(object):
 
     def check_readline(self, selftest, text):
         """ Reads line from serial port and checks if text was part of read string

tools/host_tests/echo.py

@@ -19,7 +19,7 @@
 import uuid
 from sys import stdout
 
-class EchoTest():
+class EchoTest(object):
 
     # Test parameters
     TEST_SERIAL_BAUDRATE = 115200

tools/host_tests/echo_flow_control.py

@@ -14,7 +14,7 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 """
-from host_test import Test
+from .host_test import Test
 
 
 class EchoTest(Test):

tools/host_tests/hello_auto.py

@@ -15,7 +15,7 @@
 limitations under the License.
 """
 
-class HelloTest():
+class HelloTest(object):
     HELLO_WORLD = "Hello World"
 
     def test(self, selftest):

tools/host_tests/host_registry.py

@@ -15,7 +15,7 @@
 limitations under the License.
 """
 
-class HostRegistry:
+class HostRegistry(object):
     """ Class stores registry with host tests and objects representing them
     """ 
     HOST_TESTS = {} # host_test_name -> host_test_ojbect