From ae87185ad0345767642d42d8b1a429ad100aeb8f Mon Sep 17 00:00:00 2001 From: Jakob Ketterl Date: Mon, 23 Sep 2019 03:15:24 +0200 Subject: [PATCH] run the formatter once more --- owrx/aprs.py | 11 +++-------- owrx/http.py | 2 +- owrx/meta.py | 1 - owrx/metrics.py | 1 + owrx/wsjt.py | 2 +- 5 files changed, 6 insertions(+), 11 deletions(-) diff --git a/owrx/aprs.py b/owrx/aprs.py index 3d6ab522..c0ca5f6b 100644 --- a/owrx/aprs.py +++ b/owrx/aprs.py @@ -37,14 +37,9 @@ def decodeBase91(input): base = decodeBase91(input[:-1]) * 91 if len(input) > 1 else 0 return base + (ord(input[-1]) - 33) -def getSymbolData(symbol, table): - return { - "symbol": symbol, - "table": table, - "index": ord(symbol) - 33, - "tableindex": ord(table) - 33, - } +def getSymbolData(symbol, table): + return {"symbol": symbol, "table": table, "index": ord(symbol) - 33, "tableindex": ord(table) - 33} class Ax25Parser(object): @@ -578,5 +573,5 @@ class MicEParser(object): "course": course, "device": device, "type": "Mic-E", - "symbol": getSymbolData(chr(information[7]), chr(information[8])) + "symbol": getSymbolData(chr(information[7]), chr(information[8])), } diff --git a/owrx/http.py b/owrx/http.py index 6ed11bfb..196c6c4f 100644 --- a/owrx/http.py +++ b/owrx/http.py @@ -25,7 +25,7 @@ class RequestHandler(BaseHTTPRequestHandler): super().__init__(request, client_address, server) def log_message(self, format, *args): - logger.debug("%s - - [%s] %s", self.address_string(), self.log_date_time_string(), format%args) + logger.debug("%s - - [%s] %s", self.address_string(), self.log_date_time_string(), format % args) def do_GET(self): self.router.route(self) diff --git a/owrx/meta.py b/owrx/meta.py index 4cf507e0..f4979cf3 100644 --- a/owrx/meta.py +++ b/owrx/meta.py @@ -84,7 +84,6 @@ class YsfMetaEnricher(object): class MetaParser(object): - def __init__(self, handler): self.handler = handler self.enrichers = {"DMR": DmrMetaEnricher(), "YSF": YsfMetaEnricher(self)} diff --git a/owrx/metrics.py b/owrx/metrics.py index 28444047..7055449b 100644 --- a/owrx/metrics.py +++ b/owrx/metrics.py @@ -1,5 +1,6 @@ import threading + class Metric(object): def getValue(self): return 0 diff --git a/owrx/wsjt.py b/owrx/wsjt.py index fc41cd02..95d4e654 100644 --- a/owrx/wsjt.py +++ b/owrx/wsjt.py @@ -197,7 +197,7 @@ class WsjtChopper(threading.Thread): pm = PropertyManager.getSharedInstance() # mode-specific setting? if "wsjt_decoding_depths" in pm and mode in pm["wsjt_decoding_depths"]: - return pm["wsjt_decoding_depths"][mode] + return pm["wsjt_decoding_depths"][mode] # return global default if "wsjt_decoding_depth" in pm: return pm["wsjt_decoding_depth"]