diff --git a/Tools/LogAnalyzer/DataflashLog.py b/Tools/LogAnalyzer/DataflashLog.py
index 99a92078dc..37582ef2bd 100644
--- a/Tools/LogAnalyzer/DataflashLog.py
+++ b/Tools/LogAnalyzer/DataflashLog.py
@@ -169,7 +169,7 @@ class BinaryFormat(ctypes.LittleEndianStructure):
             _pack_=True,
         )
 
-        if type(self.types[0]) is str:
+        if isinstance(self.types[0], str):
             fieldtypes = [i for i in self.types]
         else:
             fieldtypes = [chr(i) for i in self.types]
diff --git a/Tools/autotest/arducopter.py b/Tools/autotest/arducopter.py
index 6a7788c0ed..72061b9e4f 100644
--- a/Tools/autotest/arducopter.py
+++ b/Tools/autotest/arducopter.py
@@ -8576,7 +8576,7 @@ class AutoTestCopter(AutoTest):
             # to carry the path to the JSON.
             actual_model = model.split(":")[0]
             defaults = self.model_defaults_filepath(actual_model)
-            if type(defaults) is not list:
+            if not isinstance(defaults, list):
                 defaults = [defaults]
             self.customise_SITL_commandline(
                 ["--defaults", ','.join(defaults), ],
diff --git a/Tools/autotest/arduplane.py b/Tools/autotest/arduplane.py
index 698e423a09..5c2eb660e6 100644
--- a/Tools/autotest/arduplane.py
+++ b/Tools/autotest/arduplane.py
@@ -3769,7 +3769,7 @@ class AutoTestPlane(AutoTest):
             # to carry the path to the JSON.
             actual_model = model.split(":")[0]
             defaults = self.model_defaults_filepath(actual_model)
-            if type(defaults) is not list:
+            if not isinstance(defaults, list):
                 defaults = [defaults]
             self.customise_SITL_commandline(
                 ["--defaults", ','.join(defaults), ],
diff --git a/Tools/autotest/autotest.py b/Tools/autotest/autotest.py
index ce8cf760ef..04735f7fd9 100755
--- a/Tools/autotest/autotest.py
+++ b/Tools/autotest/autotest.py
@@ -378,7 +378,7 @@ def run_specific_test(step, *args, **kwargs):
 
     # print("Got %s" % str(tester))
     for a in tester.tests():
-        if type(a) is not Test:
+        if not isinstance(a, Test):
             a = Test(a)
         print("Got %s" % (a.name))
         if a.name == test:
@@ -720,7 +720,7 @@ def run_tests(steps):
         try:
             success = run_step(step)
             testinstance = None
-            if type(success) is tuple:
+            if isinstance(success, tuple):
                 (success, testinstance) = success
             if success:
                 results.add(step, '<span class="passed-text">PASSED</span>',
@@ -806,7 +806,7 @@ def list_subtests_for_vehicle(vehicle_type):
         subtests = tester.tests()
         sorted_list = []
         for subtest in subtests:
-            if type(subtest) is not Test:
+            if not isinstance(subtest, Test):
                 subtest = Test(subtest)
             sorted_list.append([subtest.name, subtest.description])
         sorted_list.sort()
diff --git a/Tools/autotest/bisect-helper.py b/Tools/autotest/bisect-helper.py
index 5812ac7a39..3858a53fb6 100755
--- a/Tools/autotest/bisect-helper.py
+++ b/Tools/autotest/bisect-helper.py
@@ -133,7 +133,7 @@ class Bisect(object):
                     # select not available on Windows... probably...
                 time.sleep(0.1)
                 continue
-            if type(x) is bytes:
+            if isinstance(x, bytes):
                 x = x.decode('utf-8')
             self.program_output += x
             x = x.rstrip()
diff --git a/Tools/autotest/check_autotest_speedup.py b/Tools/autotest/check_autotest_speedup.py
index 700298948f..621726c867 100755
--- a/Tools/autotest/check_autotest_speedup.py
+++ b/Tools/autotest/check_autotest_speedup.py
@@ -52,7 +52,7 @@ class CheckAutoTestSpeedup(object):
                     # select not available on Windows... probably...
                 time.sleep(0.1)
                 continue
-            if type(x) is bytes:
+            if isinstance(x, bytes):
                 x = x.decode('utf-8')
             self.program_output += x
             x = x.rstrip()
diff --git a/Tools/autotest/common.py b/Tools/autotest/common.py
index 04354e0e29..d792618767 100644
--- a/Tools/autotest/common.py
+++ b/Tools/autotest/common.py
@@ -2576,7 +2576,7 @@ class AutoTest(ABC):
     def find_format_defines(self, lines):
         ret = {}
         for line in lines:
-            if type(line) is bytes:
+            if isinstance(line, bytes):
                 line = line.decode("utf-8")
             m = re.match(r'#define (\w+_(?:LABELS|FMT|UNITS|MULTS))\s+(".*")', line)
             if m is None:
@@ -2633,7 +2633,7 @@ class AutoTest(ABC):
             for line in open(f).readlines():
                 if debug:
                     print("line: %s" % line)
-                if type(line) is bytes:
+                if isinstance(line, bytes):
                     line = line.decode("utf-8")
                 line = re.sub("//.*", "", line) # trim comments
                 if re.match(r"\s*$", line):
@@ -2712,7 +2712,7 @@ class AutoTest(ABC):
         linestate_within = 90
         linestate = linestate_none
         for line in open(filepath, 'rb').readlines():
-            if type(line) is bytes:
+            if isinstance(line, bytes):
                 line = line.decode("utf-8")
             line = re.sub("//.*", "", line) # trim comments
             if re.match(r"\s*$", line):
@@ -2812,7 +2812,7 @@ class AutoTest(ABC):
                         continue
                     count = 0
                     for line in open(filepath, 'rb').readlines():
-                        if type(line) is bytes:
+                        if isinstance(line, bytes):
                             line = line.decode("utf-8")
                         if state == state_outside:
                             if (re.match(r"\s*AP::logger\(\)[.]Write(?:Streaming)?\(", line) or
@@ -4835,7 +4835,7 @@ class AutoTest(ABC):
     def set_rc_from_map(self, _map, timeout=20):
         map_copy = _map.copy()
         for v in map_copy.values():
-            if type(v) is not int:
+            if not isinstance(v, int):
                 raise NotAchievedException("RC values must be integers")
         self.rc_queue.put(map_copy)
 
@@ -5490,7 +5490,7 @@ class AutoTest(ABC):
 
     def send_get_parameter_direct(self, name):
         encname = name
-        if sys.version_info.major >= 3 and type(encname) is not bytes:
+        if sys.version_info.major >= 3 and not isinstance(encname, bytes):
             encname = bytes(encname, 'ascii')
         self.mav.mav.param_request_read_send(self.sysid_thismav(),
                                              1,
@@ -5885,7 +5885,7 @@ class AutoTest(ABC):
         for param in parameter_stuff:
             fetched_value = self.get_parameter(param)
             wanted_value = parameter_stuff[param]
-            if type(wanted_value) is tuple:
+            if isinstance(wanted_value, tuple):
                 max_delta = wanted_value[1]
                 wanted_value = wanted_value[0]
             if abs(fetched_value - wanted_value) > max_delta:
@@ -6492,7 +6492,7 @@ class AutoTest(ABC):
         )
 
     def wait_and_maintain(self, value_name, target, current_value_getter, validator=None, accuracy=2.0, timeout=30, **kwargs):
-        if type(target) is Vector3:
+        if isinstance(target, Vector3):
             return self.wait_and_maintain_vector(
                 value_name,
                 target,
@@ -6648,7 +6648,7 @@ class AutoTest(ABC):
                          achieved_duration_bit)
                     )
                 else:
-                    if type(last_value) is float:
+                    if isinstance(last_value, float):
                         self.progress(
                             "%s=%0.2f (%s between %s and %s)%s" %
                             (value_name,
@@ -9726,7 +9726,7 @@ Also, ignores heartbeats not from our target system'''
 
     def set_message_rate_hz(self, id, rate_hz, mav=None):
         '''set a message rate in Hz; 0 for original, -1 to disable'''
-        if type(id) is str:
+        if isinstance(id, str):
             id = eval("mavutil.mavlink.MAVLINK_MSG_ID_%s" % id)
         if rate_hz == 0 or rate_hz == -1:
             set_interval = rate_hz
@@ -9742,7 +9742,7 @@ Also, ignores heartbeats not from our target system'''
     def send_get_message_interval(self, victim_message, mav=None):
         if mav is None:
             mav = self.mav
-        if type(victim_message) is str:
+        if isinstance(victim_message, str):
             victim_message = eval("mavutil.mavlink.MAVLINK_MSG_ID_%s" % victim_message)
         mav.mav.command_long_send(
             1,
@@ -9767,7 +9767,7 @@ Also, ignores heartbeats not from our target system'''
 
     def set_message_interval(self, victim_message, interval_us, mav=None):
         '''sets message interval in microseconds'''
-        if type(victim_message) is str:
+        if isinstance(victim_message, str):
             victim_message = eval("mavutil.mavlink.MAVLINK_MSG_ID_%s" % victim_message)
         self.run_cmd(
             mavutil.mavlink.MAV_CMD_SET_MESSAGE_INTERVAL,
@@ -9930,7 +9930,7 @@ Also, ignores heartbeats not from our target system'''
     def send_poll_message(self, message_id, target_sysid=None, target_compid=None, quiet=False, mav=None):
         if mav is None:
             mav = self.mav
-        if type(message_id) is str:
+        if isinstance(message_id, str):
             message_id = eval("mavutil.mavlink.MAVLINK_MSG_ID_%s" % message_id)
         self.send_cmd(
             mavutil.mavlink.MAV_CMD_REQUEST_MESSAGE,
@@ -9944,7 +9944,7 @@ Also, ignores heartbeats not from our target system'''
     def poll_message(self, message_id, timeout=10, quiet=False, mav=None):
         if mav is None:
             mav = self.mav
-        if type(message_id) is str:
+        if isinstance(message_id, str):
             message_id = eval("mavutil.mavlink.MAVLINK_MSG_ID_%s" % message_id)
         tstart = self.get_sim_time() # required for timeout in run_cmd_get_ack to work
         self.send_poll_message(message_id, quiet=quiet, mav=mav)
@@ -10999,7 +10999,7 @@ Also, ignores heartbeats not from our target system'''
         seq = 0
         items = []
         for locs in list_of_list_of_locs:
-            if type(locs) is dict:
+            if isinstance(locs, dict):
                 # circular fence
                 if vertex_type == mavutil.mavlink.MAV_CMD_NAV_FENCE_POLYGON_VERTEX_EXCLUSION:
                     v = mavutil.mavlink.MAV_CMD_NAV_FENCE_CIRCLE_EXCLUSION
@@ -13187,7 +13187,7 @@ switch value'''
         '''write biunary content to filepath'''
         with open(filepath, "wb") as f:
             if sys.version_info.major >= 3:
-                if type(content) is not bytes:
+                if not isinstance(content, bytes):
                     raise NotAchievedException("Want bytes to write_content_to_filepath")
             f.write(content)
             f.close()
@@ -13286,7 +13286,7 @@ SERIAL5_BAUD 128
             tests = self.tests()
         all_tests = []
         for test in tests:
-            if type(test) is not Test:
+            if not isinstance(test, Test):
                 test = Test(test)
             all_tests.append(test)
 
diff --git a/Tools/autotest/helicopter.py b/Tools/autotest/helicopter.py
index 242a456f07..09575a1b4c 100644
--- a/Tools/autotest/helicopter.py
+++ b/Tools/autotest/helicopter.py
@@ -194,7 +194,7 @@ class AutoTestHelicopter(AutoTestCopter):
             # to carry the path to the JSON.
             actual_model = model.split(":")[0]
             defaults = self.model_defaults_filepath(actual_model)
-            if type(defaults) is not list:
+            if not isinstance(defaults, list):
                 defaults = [defaults]
             self.customise_SITL_commandline(
                 ["--defaults", ','.join(defaults), ],
diff --git a/Tools/autotest/logger_metadata/parse.py b/Tools/autotest/logger_metadata/parse.py
index d66d557cf3..ea58198ea2 100755
--- a/Tools/autotest/logger_metadata/parse.py
+++ b/Tools/autotest/logger_metadata/parse.py
@@ -186,7 +186,7 @@ class LoggerDocco(object):
         # expand things like PIDR,PIDQ,PIDA into multiple doccos
         new_doccos = []
         for docco in self.doccos:
-            if type(docco.name) == list:
+            if isinstance(docco.name, list):
                 for name in docco.name:
                     tmpdocco = copy.copy(docco)
                     tmpdocco.name = name