From 07ef8e4e10946a0043d46a1c587165c413999a15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Kundr=C3=A1t?= Date: Tue, 11 May 2021 11:48:36 +0200 Subject: [PATCH] Fix (some) pep8 warnings Change-Id: I3fd709b0b12617d534ce9edd5b287539ee036b38 --- gnpy/tools/convert.py | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/gnpy/tools/convert.py b/gnpy/tools/convert.py index 11a109b1..756ebf3e 100755 --- a/gnpy/tools/convert.py +++ b/gnpy/tools/convert.py @@ -425,10 +425,9 @@ def xls_to_json_data(input_filename, filter_region=[]): 'params': {'length': round(x.west_distance, 3), 'length_units': x.distance_units, 'loss_coef': x.west_lineic, - 'con_in':x.west_con_in, - 'con_out':x.west_con_out} - } - for x in links] + + 'con_in': x.west_con_in, + 'con_out': x.west_con_out} + } for x in links] + [{'uid': f'west edfa in {x.city}', 'metadata': {'location': {'city': x.city, 'region': x.region, @@ -437,9 +436,7 @@ def xls_to_json_data(input_filename, filter_region=[]): 'type': 'Edfa', 'operational': {'gain_target': None, 'tilt_target': 0} - } - for x in nodes_by_city.values() - if x.node_type.lower() == 'ila' and x.city not in eqpts_by_city] + + } for x in nodes_by_city.values() if x.node_type.lower() == 'ila' and x.city not in eqpts_by_city] + [{'uid': f'east edfa in {x.city}', 'metadata': {'location': {'city': x.city, 'region': x.region, @@ -448,9 +445,7 @@ def xls_to_json_data(input_filename, filter_region=[]): 'type': 'Edfa', 'operational': {'gain_target': None, 'tilt_target': 0} - } - for x in nodes_by_city.values() - if x.node_type.lower() == 'ila' and x.city not in eqpts_by_city] + + } for x in nodes_by_city.values() if x.node_type.lower() == 'ila' and x.city not in eqpts_by_city] + [create_east_eqpt_element(e) for e in eqpts] + [create_west_eqpt_element(e) for e in eqpts], 'connections':