From b71db2b09425dbdd208708556f89426a4c8a1d2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20W=C3=B6hrer?= Date: Sun, 2 Jan 2022 01:01:09 +0100 Subject: [PATCH] fix space errors --- plugins/FFAgent/FFAgent.py | 10 +++--- plugins/Pushover/Pushover.py | 56 +++++++++++++++--------------- plugins/gpiocontrol/gpiocontrol.py | 2 +- plugins/httpRequest/httpRequest.py | 4 +-- 4 files changed, 36 insertions(+), 36 deletions(-) diff --git a/plugins/FFAgent/FFAgent.py b/plugins/FFAgent/FFAgent.py index 7ab8a92..e6d055f 100644 --- a/plugins/FFAgent/FFAgent.py +++ b/plugins/FFAgent/FFAgent.py @@ -138,11 +138,11 @@ def run(typ,freq,data): logging.debug(alarmHeaders) - alarmHeadersOrdered=OrderedDict() - alarmHeadersOrdered['webApiToken']=webApiToken - alarmHeadersOrdered['accessToken']=accessToken - alarmHeadersOrdered['selectiveCallCode']=selectiveCallCode - alarmHeadersOrdered['hmac']=hmac.new(webApiKey, webApiToken + selectiveCallCode + accessToken + alarmData, digestmod=hashlib.sha256).hexdigest() + alarmHeadersOrdered=OrderedDict() + alarmHeadersOrdered['webApiToken']=webApiToken + alarmHeadersOrdered['accessToken']=accessToken + alarmHeadersOrdered['selectiveCallCode']=selectiveCallCode + alarmHeadersOrdered['hmac']=hmac.new(webApiKey, webApiToken + selectiveCallCode + accessToken + alarmData, digestmod=hashlib.sha256).hexdigest() logging.debug(alarmHeadersOrdered) diff --git a/plugins/Pushover/Pushover.py b/plugins/Pushover/Pushover.py index b296808..ed975ef 100644 --- a/plugins/Pushover/Pushover.py +++ b/plugins/Pushover/Pushover.py @@ -76,16 +76,16 @@ def run(typ, freq, data): # building message for ZVEI # if globalVars.config.get("Pushover", "zvei_sep_prio") == '1': - if data["zvei"] in globalVars.config.get("Pushover", "zvei_prio2"): - priority = '2' - elif data["zvei"] in globalVars.config.get("Pushover","zvei_prio1"): - priority = '1' - elif data["zvei"] in globalVars.config.get("Pushover","zvei_prio0"): - priority = '0' - else: - priority = '-1' - else: - priority = globalVars.config.get("Pushover","zvei_std_prio") + if data["zvei"] in globalVars.config.get("Pushover", "zvei_prio2"): + priority = '2' + elif data["zvei"] in globalVars.config.get("Pushover","zvei_prio1"): + priority = '1' + elif data["zvei"] in globalVars.config.get("Pushover","zvei_prio0"): + priority = '0' + else: + priority = '-1' + else: + priority = globalVars.config.get("Pushover","zvei_std_prio") message = globalVars.config.get("Pushover", "zvei_message") title = globalVars.config.get("Pushover", "zvei_title") @@ -98,25 +98,25 @@ def run(typ, freq, data): # logging.debug("send Pushover for %s", typ) if globalVars.config.get("Pushover", "poc_spec_ric") == '0': - if data["function"] == '1': - priority = globalVars.config.get("Pushover", "SubA") - elif data["function"] == '2': - priority = globalVars.config.get("Pushover", "SubB") - elif data["function"] == '3': - priority = globalVars.config.get("Pushover", "SubC") - elif data["function"] == '4': - priority = globalVars.config.get("Pushover", "SubD") - else: - priority = 0 + if data["function"] == '1': + priority = globalVars.config.get("Pushover", "SubA") + elif data["function"] == '2': + priority = globalVars.config.get("Pushover", "SubB") + elif data["function"] == '3': + priority = globalVars.config.get("Pushover", "SubC") + elif data["function"] == '4': + priority = globalVars.config.get("Pushover", "SubD") + else: + priority = 0 else: - if data["ric"] in globalVars.config.get("Pushover", "poc_prio2"): - priority = 2 - elif data["ric"] in globalVars.config.get("Pushover","poc_prio1"): - priority = 1 - elif data["ric"] in globalVars.config.get("Pushover","poc_prio0"): - priority = 0 - else: - priority = -1 + if data["ric"] in globalVars.config.get("Pushover", "poc_prio2"): + priority = 2 + elif data["ric"] in globalVars.config.get("Pushover","poc_prio1"): + priority = 1 + elif data["ric"] in globalVars.config.get("Pushover","poc_prio0"): + priority = 0 + else: + priority = -1 message = globalVars.config.get("Pushover", "poc_message") title = globalVars.config.get("Pushover", "poc_title") diff --git a/plugins/gpiocontrol/gpiocontrol.py b/plugins/gpiocontrol/gpiocontrol.py index 63334d1..9b7f209 100644 --- a/plugins/gpiocontrol/gpiocontrol.py +++ b/plugins/gpiocontrol/gpiocontrol.py @@ -112,7 +112,7 @@ def trigger(): GPIO.output(GPIOPIN, GPIO.LOW) logging.info("GPIOPIN %s angeschaltet", GPIOPIN) time.sleep(waitTime) - GPIO.output(GPIOPIN, GPIO.HIGH) + GPIO.output(GPIOPIN, GPIO.HIGH) logging.info("GPIOPIN %s ausgeschaltet", GPIOPIN) return diff --git a/plugins/httpRequest/httpRequest.py b/plugins/httpRequest/httpRequest.py index d0442f1..88e7b0f 100644 --- a/plugins/httpRequest/httpRequest.py +++ b/plugins/httpRequest/httpRequest.py @@ -102,9 +102,9 @@ def run(typ,freq,data): try: urllib.request.urlopen(url) except urllib.error.HTTPError as e: - logging.warning("HTTP response: %s", e.code) + logging.warning("HTTP response: %s", e.code) except urllib.error.URLError as e: - logging.warning("HTTP-specific error: %s", e.args) + logging.warning("HTTP-specific error: %s", e.args) except: logging.error("cannot send HTTP request")