Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

autotest: correct bytes decoding for Python3 in Logger documentation

This commit is contained in:
Peter Barker 2020-03-29 08:25:22 +11:00 committed by Peter Barker
parent b8dba9886f
commit 53ced35f9d
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Tools/autotest/common.py
View File

@ -1056,6 +1056,8 @@ class AutoTest(ABC):
def find_format_defines(self, filepath):
ret = {}
for line in open(filepath,'rb').readlines():
if type(line) == bytes:
line = line.decode("utf-8")
m = re.match('#define (\w+_(?:LABELS|FMT|UNITS|MULTS))\s+(".*")', line)
if m is None:
continue
@ -1089,6 +1091,8 @@ class AutoTest(ABC):
message_infos = []
for line in open(filepath,'rb').readlines():
# print("line: %s" % line)
if type(line) == bytes:
line = line.decode("utf-8")
line = re.sub("//.*", "", line) # trim comments
if re.match("\s*$", line):
# blank line
@ -1141,6 +1145,8 @@ class AutoTest(ABC):
linestate_within = 90
linestate = linestate_none
for line in open(filepath,'rb').readlines():
if type(line) == bytes:
line = line.decode("utf-8")
line = re.sub("//.*", "", line) # trim comments
if re.match("\s*$", line):
# blank line
@ -1222,6 +1228,8 @@ class AutoTest(ABC):
filepath = os.path.join(root, f)
count = 0
for line in open(filepath,'rb').readlines():
if type(line) == bytes:
line = line.decode("utf-8")
if state == state_outside:
if re.match("\s*AP::logger\(\)[.]Write\(", line):
state = state_inside