From 7e9267072cc316683ec613ff1bc59a134308a0f5 Mon Sep 17 00:00:00 2001 From: "Tobias Wellnitz, DH1TW" Date: Sun, 24 Dec 2023 00:44:43 +0100 Subject: [PATCH] dxcluster: updated regex in syntax --- pyhamtools/dxcluster.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pyhamtools/dxcluster.py b/pyhamtools/dxcluster.py index 2417382..c148c76 100644 --- a/pyhamtools/dxcluster.py +++ b/pyhamtools/dxcluster.py @@ -19,18 +19,18 @@ def decode_char_spot(raw_string): data = {} # Spotter callsign - if re.match('[A-Za-z0-9\/]+[:$]', raw_string[6:15]): - data[const.SPOTTER] = re.sub(':', '', re.match('[A-Za-z0-9\/]+[:$]', raw_string[6:15]).group(0)) + if re.match(r'[A-Za-z0-9\/]+[:$]', raw_string[6:15]): + data[const.SPOTTER] = re.sub(':', '', re.match(r'[A-Za-z0-9\/]+[:$]', raw_string[6:15]).group(0)) else: raise ValueError - if re.search('[0-9\.]{5,12}', raw_string[10:25]): - data[const.FREQUENCY] = float(re.search('[0-9\.]{5,12}', raw_string[10:25]).group(0)) + if re.search(r'[0-9\.]{5,12}', raw_string[10:25]): + data[const.FREQUENCY] = float(re.search(r'[0-9\.]{5,12}', raw_string[10:25]).group(0)) else: raise ValueError - data[const.DX] = re.sub('[^A-Za-z0-9\/]+', '', raw_string[26:38]) - data[const.COMMENT] = re.sub('[^\sA-Za-z0-9\.,;\#\+\-!\?\$\(\)@\/]+', ' ', raw_string[39:69]).strip() + data[const.DX] = re.sub(r'[^A-Za-z0-9\/]+', '', raw_string[26:38]) + data[const.COMMENT] = re.sub(r'[^\sA-Za-z0-9\.,;\#\+\-!\?\$\(\)@\/]+', ' ', raw_string[39:69]).strip() data[const.TIME] = datetime.now().replace(tzinfo=UTC) return data