Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-03 14:38:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Tools: fix flake8 test

Browse Source
This commit is contained in:
Pierre Kancir 2023-08-22 23:22:31 +02:00 committed by Peter Barker
parent b97e98242b
commit 904486c846
9 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Tools/LogAnalyzer/DataflashLog.py
View File

@ -169,7 +169,7 @@ class BinaryFormat(ctypes.LittleEndianStructure):
_pack_=True,
)
if type(self.types[0]) == str:
if type(self.types[0]) is str:
fieldtypes = [i for i in self.types]
else:
fieldtypes = [chr(i) for i in self.types]

4
Tools/autotest/arducopter.py
View File

@ -4405,7 +4405,7 @@ class AutoTestCopter(AutoTest):
MAV_POS_TARGET_TYPE_MASK.POS_ONLY | MAV_POS_TARGET_TYPE_MASK.LAST_BYTE, # mask specifying use-only-x-y-z
x, # x
y, # y
-z_up,# z
-z_up, # z
0, # vx
0, # vy
0, # vz
@ -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) != list:
if type(defaults) is not list:
defaults = [defaults]
self.customise_SITL_commandline(
["--defaults", ','.join(defaults), ],

2
Tools/autotest/arduplane.py
View File

@ -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) != list:
if type(defaults) is not list:
defaults = [defaults]
self.customise_SITL_commandline(
["--defaults", ','.join(defaults), ],

6
Tools/autotest/autotest.py
View File

@ -378,7 +378,7 @@ def run_specific_test(step, *args, **kwargs):
# print("Got %s" % str(tester))
for a in tester.tests():
if type(a) != Test:
if type(a) is not 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) == tuple:
if type(success) is 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) != Test:
if type(subtest) is not Test:
subtest = Test(subtest)
sorted_list.append([subtest.name, subtest.description])
sorted_list.sort()

2
Tools/autotest/bisect-helper.py
View File

@ -133,7 +133,7 @@ class Bisect(object):
# select not available on Windows... probably...
time.sleep(0.1)
continue
if type(x) == bytes:
if type(x) is bytes:
x = x.decode('utf-8')
self.program_output += x
x = x.rstrip()

2
Tools/autotest/check_autotest_speedup.py
View File

@ -52,7 +52,7 @@ class CheckAutoTestSpeedup(object):
# select not available on Windows... probably...
time.sleep(0.1)
continue
if type(x) == bytes:
if type(x) is bytes:
x = x.decode('utf-8')
self.program_output += x
x = x.rstrip()

30
Tools/autotest/common.py
View File

@ -2576,7 +2576,7 @@ class AutoTest(ABC):
def find_format_defines(self, lines):
ret = {}
for line in lines:
if type(line) == bytes:
if type(line) is 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) == bytes:
if type(line) is 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) == bytes:
if type(line) is 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) == bytes:
if type(line) is 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) != int:
if type(v) is not 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) != bytes:
if sys.version_info.major >= 3 and type(encname) is not 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) == tuple:
if type(wanted_value) is tuple:
max_delta = wanted_value[1]
wanted_value = wanted_value[0]
if abs(fetched_value - wanted_value) > max_delta:
@ -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) == str:
if type(id) is 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) == str:
if type(victim_message) is 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) == str:
if type(victim_message) is 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) == str:
if type(message_id) is 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) == str:
if type(message_id) is 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) == dict:
if type(locs) is 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) != bytes:
if type(content) is not 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) != Test:
if type(test) is not Test:
test = Test(test)
all_tests.append(test)

2
Tools/autotest/helicopter.py
View File

@ -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) != list:
if type(defaults) is not list:
defaults = [defaults]
self.customise_SITL_commandline(
["--defaults", ','.join(defaults), ],

2
Tools/gittools/pre-commit.py
View File

@ -44,7 +44,7 @@ class AP_PreCommit(object):
def split_git_diff_output(output):
'''split output from git-diff into a list of (status, filepath) tuples'''
ret = []
if type(output) == bytes:
if type(output) is bytes:
output = output.decode('utf-8')
for line in output.split("\n"):
if len(line) == 0: