From ffdb5a5413f22f57e611105d5ab8aca319dad01d Mon Sep 17 00:00:00 2001 From: Dashie Date: Tue, 9 Aug 2022 11:31:33 +0200 Subject: [PATCH] maybe encode only if bytes; also condition now unneeded --- server/trackdirect/parser/policies/PacketCommentPolicy.py | 2 +- server/trackdirect/repositories/PacketTelemetryRepository.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/trackdirect/parser/policies/PacketCommentPolicy.py b/server/trackdirect/parser/policies/PacketCommentPolicy.py index dba7bf6..e2fde32 100644 --- a/server/trackdirect/parser/policies/PacketCommentPolicy.py +++ b/server/trackdirect/parser/policies/PacketCommentPolicy.py @@ -29,7 +29,7 @@ class PacketCommentPolicy(): elif ("comment" in data): comment = data["comment"] - if isinstance(comment, str): + if isinstance(comment, bytes): comment = comment.encode('ascii', 'ignore') comment = comment.replace('\x00', '') diff --git a/server/trackdirect/repositories/PacketTelemetryRepository.py b/server/trackdirect/repositories/PacketTelemetryRepository.py index fb3ff5b..c816f6a 100644 --- a/server/trackdirect/repositories/PacketTelemetryRepository.py +++ b/server/trackdirect/repositories/PacketTelemetryRepository.py @@ -109,7 +109,7 @@ class PacketTelemetryRepository(Repository): newObject.bits = data["telemetry"]["bits"] if ("seq" in data["telemetry"]): - if isinstance(data["telemetry"]["seq"], str) or isinstance(data["telemetry"]["seq"], str): + if isinstance(data["telemetry"]["seq"], str): try: newObject.seq = int(data["telemetry"]["seq"], 10) except ValueError: