From 2f0f74a06d265ca62c9b80471098cbf3e28dfd78 Mon Sep 17 00:00:00 2001 From: Rossen Georgiev Date: Tue, 8 Oct 2019 19:42:44 +0100 Subject: [PATCH] fix SyntaxWarning for py38 and remove py33 on travis --- .travis.yml | 1 - aprslib/parsing/mice.py | 10 +++++----- tests/test_parse_comment_telemetry.py | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3e5346a..c130959 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,6 @@ language: python sudo: false python: - "2.7" - - "3.3" - "3.4" - "3.5" - "3.6" diff --git a/aprslib/parsing/mice.py b/aprslib/parsing/mice.py index 36720d1..64c03c1 100644 --- a/aprslib/parsing/mice.py +++ b/aprslib/parsing/mice.py @@ -140,15 +140,15 @@ def parse_mice(dstcall, body): # apply position ambiguity # routines adjust longitude to center of the ambiguity box - if posambiguity is 4: + if posambiguity == 4: lngminutes = 30 - elif posambiguity is 3: + elif posambiguity == 3: lngminutes = (math.floor(lngminutes/10) + 0.5) * 10 - elif posambiguity is 2: + elif posambiguity == 2: lngminutes = math.floor(lngminutes) + 0.5 - elif posambiguity is 1: + elif posambiguity == 1: lngminutes = (math.floor(lngminutes*10) + 0.5) / 10.0 - elif posambiguity is not 0: + elif posambiguity != 0: raise ParseError("Unsupported position ambiguity: %d" % posambiguity) longitude += lngminutes / 60.0 diff --git a/tests/test_parse_comment_telemetry.py b/tests/test_parse_comment_telemetry.py index 91b7ab8..59447b4 100644 --- a/tests/test_parse_comment_telemetry.py +++ b/tests/test_parse_comment_telemetry.py @@ -47,7 +47,7 @@ class ParseCommentTelemetry(unittest.TestCase): bits = None - if len(vals) is 5 and randint(1, 10) > 5: + if len(vals) == 5 and randint(1, 10) > 5: bits = "{0:08b}".format(randint(0, 255))[::-1] testData = self.genTelem(i, vals, bits)