diff --git a/server/trackdirect/parser/policies/PacketCommentPolicy.py b/server/trackdirect/parser/policies/PacketCommentPolicy.py index e2a4c4939250f870a899f8f79f3c697fcc95e135..dba7bf621133bcbbeaa773037f1abe1cbe5ea453 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, unicode): + if isinstance(comment, str): comment = comment.encode('ascii', 'ignore') comment = comment.replace('\x00', '') diff --git a/server/trackdirect/repositories/PacketTelemetryRepository.py b/server/trackdirect/repositories/PacketTelemetryRepository.py index 3c9508820c39d8e9f698ebe66230209a3237daaf..fb3ff5bd7d1b70ad432844d482eeada715605eb2 100644 --- a/server/trackdirect/repositories/PacketTelemetryRepository.py +++ b/server/trackdirect/repositories/PacketTelemetryRepository.py @@ -1,4 +1,3 @@ -import datetime import time from trackdirect.common.Repository import Repository @@ -110,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"], unicode): + if isinstance(data["telemetry"]["seq"], str) or isinstance(data["telemetry"]["seq"], str): try: newObject.seq = int(data["telemetry"]["seq"], 10) except ValueError: