From 52c429cd6082e81fc8e31ae3431d50cf6b398385 Mon Sep 17 00:00:00 2001
From: Dashie <dashie@sigpipe.me>
Date: Tue, 9 Aug 2022 11:29:24 +0200
Subject: [PATCH] py3: unicode is now str
---
server/trackdirect/parser/policies/PacketCommentPolicy.py | 2 +-
server/trackdirect/repositories/PacketTelemetryRepository.py | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/server/trackdirect/parser/policies/PacketCommentPolicy.py b/server/trackdirect/parser/policies/PacketCommentPolicy.py
index e2a4c49..dba7bf6 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 3c95088..fb3ff5b 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:
--
GitLab