From 34840ad9dbda8c4dbf06170c82d2ab6cf31f9a1f Mon Sep 17 00:00:00 2001 From: Lars Kruse Date: Tue, 27 Mar 2018 04:18:45 +0200 Subject: [PATCH] Plugin weather_: fixes style issues --- plugins/weather/weather_ | 72 ++++++++++++++++++++-------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/plugins/weather/weather_ b/plugins/weather/weather_ index d91580b7..c083df41 100755 --- a/plugins/weather/weather_ +++ b/plugins/weather/weather_ @@ -11,51 +11,51 @@ re_tmp = re.compile('realTemp: "(\d+)"') re_hum = re.compile('relativeHumidity: "(\d+)"') re_loc = re.compile('locName: "([\w ]+)"') -#code = sys.argv[0][(sys.argv[0].rfind('_') + 1):] +# code = sys.argv[0][(sys.argv[0].rfind('_') + 1):] code = os.environ.get('code', sys.argv[0][(sys.argv[0].rfind('_') + 1):]) -if code == None: sys.exit(1) - -if len(sys.argv) == 2 and sys.argv[1] == "autoconf": - print "yes" +if not code: + sys.exit(1) +elif len(sys.argv) == 2 and sys.argv[1] == "autoconf": + print("yes") elif len(sys.argv) == 2 and sys.argv[1] == "config": - u = urllib.urlopen(url % code) - txt = u.read() - u.close() + u = urllib.urlopen(url % code) + txt = u.read() + u.close() - LOC_list = re_loc.findall(txt) - - if len(LOC_list): - LOC = LOC_list[0] - else: - LOC = "Unknown" + LOC_list = re_loc.findall(txt) - print 'graph_title Weather in %s' % LOC - print 'graph_vlabel Temperature and Humidity' - print 'graph_category sensors' + if len(LOC_list): + LOC = LOC_list[0] + else: + LOC = "Unknown" - print 'temperature.label Temperature' - print 'humidity.label Humidity' + print('graph_title Weather in %s' % LOC) + print('graph_vlabel Temperature and Humidity') + print('graph_category sensors') - print 'graph_args --base 1000 -l 0' + print('temperature.label Temperature') + print('humidity.label Humidity') + + print('graph_args --base 1000 -l 0') else: - u = urllib.urlopen(url % code) - txt = u.read() - u.close() + u = urllib.urlopen(url % code) + txt = u.read() + u.close() - TMP_F_list = re_tmp.findall(txt) - HUM_list = re_hum.findall(txt) + TMP_F_list = re_tmp.findall(txt) + HUM_list = re_hum.findall(txt) - if len(HUM_list): - HUM = HUM_list[0] - else: - sys.exit(1) + if len(HUM_list): + HUM = HUM_list[0] + else: + sys.exit(1) - if len(TMP_F_list): - TMP_F = TMP_F_list[0] - TMP_C = (int(TMP_F) - 32) * 5/9 - else: - sys.exit(1) + if len(TMP_F_list): + TMP_F = TMP_F_list[0] + TMP_C = (int(TMP_F) - 32) * 5/9 + else: + sys.exit(1) - print 'temperature.value %s' % TMP_C - print 'humidity.value %s' % HUM + print('temperature.value %s' % TMP_C) + print('humidity.value %s' % HUM)