From 2724d6682af2fb05c7e44c3286b39812bc6aa204 Mon Sep 17 00:00:00 2001 From: Rossen Georgiev Date: Fri, 4 Mar 2016 07:42:07 +0000 Subject: [PATCH] fix fail to parse telem config with end whitespace --- aprslib/parsing/telemetry.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/aprslib/parsing/telemetry.py b/aprslib/parsing/telemetry.py index a6308af..b3f35b5 100644 --- a/aprslib/parsing/telemetry.py +++ b/aprslib/parsing/telemetry.py @@ -51,7 +51,7 @@ def parse_telemetry_config(body): parsed.update({'format': 'telemetry-message'}) if form in ["PARM", "UNIT"]: - vals = body.split(',')[:13] + vals = body.rstrip().split(',')[:13] for val in vals: if not re.match(r"^(.{1,20}|)$", val): @@ -64,7 +64,7 @@ def parse_telemetry_config(body): 't%s' % form: defvals }) elif form == "EQNS": - eqns = body.split(',')[:15] + eqns = body.rstrip().split(',')[:15] teqns = [0, 1, 0] * 5 for idx, val in enumerate(eqns): @@ -85,7 +85,7 @@ def parse_telemetry_config(body): 't%s' % form: teqns }) elif form == "BITS": - match = re.findall(r"^([01]{8}),(.{0,23})$", body) + match = re.findall(r"^([01]{8}),(.{0,23})$", body.rstrip()) if not match: raise ParseError("incorrect format of %s (title too long?)" % form)