summaryrefslogtreecommitdiff
path: root/gps
diff options
context:
space:
mode:
authorGary E. Miller <gem@rellim.com>2018-07-14 14:02:30 -0700
committerGary E. Miller <gem@rellim.com>2018-07-14 14:02:30 -0700
commit8347fcdab092a88529aa7eb05d83b18638a14b67 (patch)
tree9e87340456f2adb70b56af3c4a1f821560655905 /gps
parentf8aa971c9b806f19619b4d934a51c360e55101d7 (diff)
downloadgpsd-8347fcdab092a88529aa7eb05d83b18638a14b67.tar.gz
gps.gps.py: isnan() -> isfinite()
Thanks to Virgin Orbit for their support on this patch.
Diffstat (limited to 'gps')
-rw-r--r--[-rwxr-xr-x]gps/gps.py14
1 files changed, 8 insertions, 6 deletions
diff --git a/gps/gps.py b/gps/gps.py
index 99b33366..bc60de6a 100755..100644
--- a/gps/gps.py
+++ b/gps/gps.py
@@ -19,15 +19,17 @@
# Preserve this property!
from __future__ import absolute_import, print_function, division
-# since Python 2.6
-from math import isnan
-
from .client import *
from .watch_options import *
NaN = float('nan')
+def isfinite(f):
+ # Python 2 does not think +Inf or -Inf are NaN
+ # Python 2 has no easier way to test for Inf
+ return float('-inf') < float(f) < float('inf')
+
# Don't hand-hack this list, it's generated.
ONLINE_SET = (1 << 1)
TIME_SET = (1 << 2)
@@ -141,15 +143,15 @@ class gpsdata(object):
def __repr__(self):
st = "Time: %s (%s)\n" % (self.utc, self.fix.time)
st += "Lat/Lon: %f %f\n" % (self.fix.latitude, self.fix.longitude)
- if isnan(self.fix.altitude):
+ if not isfinite(self.fix.altitude):
st += "Altitude: ?\n"
else:
st += "Altitude: %f\n" % (self.fix.altitude)
- if isnan(self.fix.speed):
+ if not isfinite(self.fix.speed):
st += "Speed: ?\n"
else:
st += "Speed: %f\n" % (self.fix.speed)
- if isnan(self.fix.track):
+ if not isfinite(self.fix.track):
st += "Track: ?\n"
else:
st += "Track: %f\n" % (self.fix.track)