Merge pull request #35 from bridadan/fix_imports

Fix improper imports and uses of modules/function

Author: theotherjimmy

mbed_os_tools/detect/lstools_base.py

@@ -449,13 +449,6 @@ def get_supported_platforms(self, device_type=None):
         items = self.plat_db.items(**kwargs)
         return {i[0]: i[1] for i in items}
 
-    def __str__(self):
-        """! Object to string casting
-
-        @return Stringified class object should be prettytable formated string
-        """
-        return self.get_string()
-
     # Private functions supporting API
     def _read_htm_ids(self, mount_point):
         """! Function scans mbed.htm to get information about TargetID.

mbed_os_tools/test/host_tests_plugins/host_test_plugins.py

@@ -137,7 +137,7 @@ def check_mount_point_ready(self, destination_disk, init_delay=0.2, loop_delay=0
             for i in range(timeout):
                 # mbed_os_tools.detect.create() should be done inside the loop.
                 # Otherwise it will loop on same data.
-                mbeds = mbed_os_tools.detect.create()
+                mbeds = detect.create()
                 mbed_list = mbeds.list_mbeds() #list of mbeds present
                 # get first item in list with a matching target_id, if present
                 mbed_target = next((x for x in mbed_list if x['target_id']==target_id), None)
@@ -190,7 +190,7 @@ def check_serial_port_ready(self, serial_port, target_id=None, timeout=60):
             timeout = int(timeout / timeout_step)
             for i in range(timeout):
                 # mbed_os_tools.detect.create() should be done inside the loop. Otherwise it will loop on same data.
-                mbeds = mbed_os_tools.detect.create()
+                mbeds = detect.create()
                 mbed_list = mbeds.list_mbeds() #list of mbeds present
                 # get first item in list with a matching target_id, if present
                 mbed_target = next((x for x in mbed_list if x['target_id']==target_id), None)

mbed_os_tools/test/host_tests_runner/mbed_base.py

@@ -20,7 +20,7 @@
 import json
 import os
 from time import sleep
-import ..host_tests_plugins as ht_plugins
+from .. import host_tests_plugins as ht_plugins
 from ... import detect
 from .. import DEFAULT_BAUD_RATE
 from ..host_tests_logger import HtrunLogger
@@ -125,7 +125,7 @@ def check_flash_error(target_id, disk, initial_remount_count):
             # Re-try at max 5 times with 0.5 sec in delay
             for i in range(5):
                 # mbed_os_tools.detect.create() should be done inside the loop. Otherwise it will loop on same data.
-                mbeds = mbed_os_tools.detect.create()
+                mbeds = detect.create()
                 mbed_list = mbeds.list_mbeds() #list of mbeds present
                 # get first item in list with a matching target_id, if present
                 mbed_target = next((x for x in mbed_list if x['target_id']==target_id), None)
@@ -234,4 +234,3 @@ def hw_reset(self):
             self.port = device_info['serial_port']
             self.disk = device_info['mount_point']
         return result
-