From cd7b9cf2350254ffb38c56014108a63f3b42ae3a Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Sat, 28 Apr 2012 23:06:34 +0200 Subject: [PATCH] Make script Python3 compatible --- bat2nodes.py | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/bat2nodes.py b/bat2nodes.py index 6627f2d..5a607de 100644 --- a/bat2nodes.py +++ b/bat2nodes.py @@ -4,7 +4,7 @@ # Gatewayliste # aliases.json -import simplejson as json +import json import fileinput import argparse @@ -128,12 +128,13 @@ if options['aliases']: if 'group' in alias: node.group = alias['group'] -for gateway in options['gateway']: - try: - node = maybe_node_by_mac(nodes, (gateway, )) - node.group = 2 - except: - continue +if options['gateway']: + for gateway in options['gateway']: + try: + node = maybe_node_by_mac(nodes, (gateway, )) + node.group = 2 + except: + continue def map_link(nodes, pair): distance = 80 @@ -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, - 'macs': ', '.join(x.macs) - }, nodes) -output['links'] = map(lambda x: {'source': x.pair[0], 'target': x.pair[1], - 'distance': x.distance, - 'strength': x.strength - }, links) +output['nodes'] = [{'group': x.group, 'name': x.name, + 'macs': ', '.join(x.macs) + } for x in nodes] +output['links'] = [{'source': x.pair[0], 'target': x.pair[1], + 'distance': x.distance, + 'strength': x.strength + } for x in links] -print json.dumps(output) +print(json.dumps(output))