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

Tools: UnitTest.py: Change usage of next() 

__lit.next()__ is not Python 3 compatible but __next(lit)__ is compatible with both Python 2 and 3.

In Python 2.6 and later, it is safe to merely switch from lit.next() to next(lit). See: http://python3porting.com/improving.html#the-next-next Both the automated tools 2to3 and futurize consider this "fixer" to be a "safe" change as we saw in #6954
This commit is contained in:
cclauss 2017-09-25 18:27:09 +02:00 committed by Peter Barker
parent 3023fac4d0
commit 5729838a85
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Tools/LogAnalyzer/UnitTest.py
View File

@ -56,10 +56,10 @@ try:
assert(lit['ATT']['RollIn'] == 11.19) assert(lit['ATT']['RollIn'] == 11.19)
assert(lit['CURR']['CurrTot'] == 25.827288) assert(lit['CURR']['CurrTot'] == 25.827288)
assert(lit['D32']['Value'] == 11122) assert(lit['D32']['Value'] == 11122)
lit.next() next(lit)
assert(lit.iterators == {'CURR': (9, 514), 'ERR': (1, 553), 'NTUN': (0, 2206), 'CTUN': (88, 502), 'GPS': (0, 552), 'CMD': (0, 607), 'D32': (0, 305), 'ATT': (83, 501), 'EV': (4, 606), 'DU32': (9, 513), 'PM': (1, 719)}) assert(lit.iterators == {'CURR': (9, 514), 'ERR': (1, 553), 'NTUN': (0, 2206), 'CTUN': (88, 502), 'GPS': (0, 552), 'CMD': (0, 607), 'D32': (0, 305), 'ATT': (83, 501), 'EV': (4, 606), 'DU32': (9, 513), 'PM': (1, 719)})
lit.jump(4750) lit.jump(4750)
lit.next() next(lit)
assert(lit.currentLine == 4751) assert(lit.currentLine == 4751)
assert(lit['ATT']['Roll'] == 2.99) assert(lit['ATT']['Roll'] == 2.99)
@ -76,11 +76,3 @@ try:
except Exception as e: except Exception as e:
print("Error found: " + traceback.format_exc()) print("Error found: " + traceback.format_exc())
print("UNIT TEST FAILED\n") print("UNIT TEST FAILED\n")