Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-23 00:04:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

autotest: correct exception handling for Python 3.10

Browse Source
This commit is contained in:
Peter Barker 2022-03-07 12:45:19 +11:00 committed by Peter Barker
parent 7e7da560d5
commit f2fe55b5da
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Tools/autotest/common.py
View File

@ -6558,10 +6558,12 @@ Also, ignores heartbeats not from our target system'''
def get_exception_stacktrace(self, e): def get_exception_stacktrace(self, e):
if sys.version_info[0] >= 3: if sys.version_info[0] >= 3:
ret = "%s\n" % e ret = "%s\n" % e
ret += ''.join(traceback.format_exception(etype=type(e), ret += ''.join(traceback.format_exception(type(e),
value=e, e,
tb=e.__traceback__)) tb=e.__traceback__))
return ret return ret
# Python2:
return traceback.format_exc(e) return traceback.format_exc(e)
def bin_logs(self): def bin_logs(self):

6
Tools/scripts/build_binaries.py
View File

@ -527,10 +527,12 @@ is bob we will attempt to checkout bob-AVR'''
def get_exception_stacktrace(self, e): def get_exception_stacktrace(self, e):
if sys.version_info[0] >= 3: if sys.version_info[0] >= 3:
ret = "%s\n" % e ret = "%s\n" % e
ret += ''.join(traceback.format_exception(etype=type(e), ret += ''.join(traceback.format_exception(type(e),
value=e, e,
tb=e.__traceback__)) tb=e.__traceback__))
return ret return ret
# Python2:
return traceback.format_exc(e) return traceback.format_exc(e)
def print_exception_caught(self, e, send_statustext=True): def print_exception_caught(self, e, send_statustext=True):