Old style exceptions are Python 3 syntax errors

This commit is contained in:
Christian Clauss 2019-09-22 20:16:14 +02:00 committed by Daniel Agar
parent bc35251799
commit 41516fbd55
3 changed files with 9 additions and 12 deletions

View File

@ -108,7 +108,7 @@ def run_tidy(args, tmpdir, build_path, queue):
try:
subprocess.check_call(invocation, stdin=None, stdout=open(os.devnull, 'wb'), stderr=subprocess.STDOUT)
except subprocess.CalledProcessError, e:
except subprocess.CalledProcessError as e:
sys.stdout.write(' '.join(invocation) + '\n')
subprocess.call(invocation)
global tidy_failures

View File

@ -518,7 +518,7 @@ class OutputGraphviz(object):
graph.edge('t_'+topic, 'm_'+module,
color=topic_colors[topic])
graph.render(file_name, view=False)
graph.render(file_name, view=False)
class OutputJSON(object):
@ -633,6 +633,3 @@ elif args.output == 'graphviz':
output_graphviz.write(args.file+'_pubs.fv', show_subscriptions=False, engine=engine)
else:
print('Error: unknown output format '+args.output)

View File

@ -86,10 +86,10 @@ def read_mission_json(f):
current = True
missionlist=[]
for wp in d['items']:
cmd = Command( 0, 0, 0, int(wp['frame']), int(wp['command']), current, int(wp['autoContinue']), float(wp['param1']), float(wp['param2']), float(wp['param3']), float(wp['param4']), float(wp['coordinate'][0]), float(wp['coordinate'][1]), float(wp['coordinate'][2]))
missionlist.append(cmd)
if current:
current = False
cmd = Command( 0, 0, 0, int(wp['frame']), int(wp['command']), current, int(wp['autoContinue']), float(wp['param1']), float(wp['param2']), float(wp['param3']), float(wp['param4']), float(wp['coordinate'][0]), float(wp['coordinate'][1]), float(wp['coordinate'][2]))
missionlist.append(cmd)
if current:
current = False
return missionlist
@ -99,7 +99,7 @@ def upload_mission(aFileName):
"""
#Read mission from file
with open(aFileName) as f:
missionlist = read_mission_json(f)
missionlist = read_mission_json(f)
#Clear existing mission from vehicle
cmds = vehicle.commands
@ -126,7 +126,7 @@ home_position_set = False
@vehicle.on_message('MISSION_CURRENT')
def listener(self, name, mission_current):
global current_sequence, current_sequence_changed
if (current_sequence <> mission_current.seq):
if (current_sequence != mission_current.seq):
current_sequence = mission_current.seq;
current_sequence_changed = True
print('current mission sequence: %s' % mission_current.seq)
@ -135,7 +135,7 @@ def listener(self, name, mission_current):
@vehicle.on_message('EXTENDED_SYS_STATE')
def listener(self, name, extended_sys_state):
global current_landed_state
if (current_landed_state <> extended_sys_state.landed_state):
if (current_landed_state != extended_sys_state.landed_state):
current_landed_state = extended_sys_state.landed_state;
#Create a message listener for home position fix