Make script Python3 compatible

alfred-data
Matthias Schiffer 2012-04-28 23:06:34 +02:00
parent aabaabc67a
commit cd7b9cf235
1 changed files with 17 additions and 16 deletions

View File

@ -4,7 +4,7 @@
# Gatewayliste
# aliases.json
import simplejson as json
import json
import fileinput
import argparse
@ -128,7 +128,8 @@ if options['aliases']:
if 'group' in alias:
node.group = alias['group']
for gateway in options['gateway']:
if options['gateway']:
for gateway in options['gateway']:
try:
node = maybe_node_by_mac(nodes, (gateway, ))
node.group = 2
@ -149,16 +150,16 @@ def map_link(nodes, pair):
return link
links = map(lambda x: map_link(nodes, x), links)
links = [map_link(nodes, x) for x in links]
output = dict()
output['nodes'] = map(lambda x: {'group': x.group, 'name': x.name,
output['nodes'] = [{'group': x.group, 'name': x.name,
'macs': ', '.join(x.macs)
}, nodes)
output['links'] = map(lambda x: {'source': x.pair[0], 'target': x.pair[1],
} for x in nodes]
output['links'] = [{'source': x.pair[0], 'target': x.pair[1],
'distance': x.distance,
'strength': x.strength
}, links)
} for x in links]
print json.dumps(output)
print(json.dumps(output))