gps.py: pep8 fixes

1 files changed, 88 insertions, 81 deletions

diff --git a/gps/gps.py b/gps/gps.py
index d6188c7c..22e023f1 100755
--- a/gps/gps.py
+++ b/gps/gps.py
@@ -25,44 +25,46 @@ from .misc import isotime
 NaN = float('nan')
 
 
-def isnan(x): return str(x) == 'nan'
+def isnan(x):
+    return str(x) == 'nan'
 
 # Don't hand-hack this list, it's generated.
-ONLINE_SET      = (1<<1)
-TIME_SET        = (1<<2)
-TIMERR_SET      = (1<<3)
-LATLON_SET      = (1<<4)
-ALTITUDE_SET    = (1<<5)
-SPEED_SET       = (1<<6)
-TRACK_SET       = (1<<7)
-CLIMB_SET       = (1<<8)
-STATUS_SET      = (1<<9)
-MODE_SET        = (1<<10)
-DOP_SET         = (1<<11)
-HERR_SET        = (1<<12)
-VERR_SET        = (1<<13)
-ATTITUDE_SET    = (1<<14)
-SATELLITE_SET   = (1<<15)
-SPEEDERR_SET    = (1<<16)
-TRACKERR_SET    = (1<<17)
-CLIMBERR_SET    = (1<<18)
-DEVICE_SET      = (1<<19)
-DEVICELIST_SET  = (1<<20)
-DEVICEID_SET    = (1<<21)
-RTCM2_SET       = (1<<22)
-RTCM3_SET       = (1<<23)
-AIS_SET         = (1<<24)
-PACKET_SET      = (1<<25)
-SUBFRAME_SET    = (1<<26)
-GST_SET         = (1<<27)
-VERSION_SET     = (1<<28)
-POLICY_SET      = (1<<29)
-LOGMESSAGE_SET  = (1<<30)
-ERROR_SET       = (1<<31)
-TIMEDRIFT_SET   = (1<<32)
-EOF_SET         = (1<<33)
-SET_HIGH_BIT    = 34
-UNION_SET       = (RTCM2_SET|RTCM3_SET|SUBFRAME_SET|AIS_SET|VERSION_SET|DEVICELIST_SET|ERROR_SET|GST_SET)
+ONLINE_SET = (1 << 1)
+TIME_SET = (1 << 2)
+TIMERR_SET = (1 << 3)
+LATLON_SET = (1 << 4)
+ALTITUDE_SET = (1 << 5)
+SPEED_SET = (1 << 6)
+TRACK_SET = (1 << 7)
+CLIMB_SET = (1 << 8)
+STATUS_SET = (1 << 9)
+MODE_SET = (1 << 10)
+DOP_SET = (1 << 11)
+HERR_SET = (1 << 12)
+VERR_SET = (1 << 13)
+ATTITUDE_SET = (1 << 14)
+SATELLITE_SET = (1 << 15)
+SPEEDERR_SET = (1 << 16)
+TRACKERR_SET = (1 << 17)
+CLIMBERR_SET = (1 << 18)
+DEVICE_SET = (1 << 19)
+DEVICELIST_SET = (1 << 20)
+DEVICEID_SET = (1 << 21)
+RTCM2_SET = (1 << 22)
+RTCM3_SET = (1 << 23)
+AIS_SET = (1 << 24)
+PACKET_SET = (1 << 25)
+SUBFRAME_SET = (1 << 26)
+GST_SET = (1 << 27)
+VERSION_SET = (1 << 28)
+POLICY_SET = (1 << 29)
+LOGMESSAGE_SET = (1 << 30)
+ERROR_SET = (1 << 31)
+TIMEDRIFT_SET = (1 << 32)
+EOF_SET = (1 << 33)
+SET_HIGH_BIT = 34
+UNION_SET = (RTCM2_SET | RTCM3_SET | SUBFRAME_SET | AIS_SET | VERSION_SET
+             | DEVICELIST_SET | ERROR_SET | GST_SET)
 STATUS_NO_FIX = 0
 STATUS_FIX = 1
 STATUS_DGPS_FIX = 2
@@ -72,19 +74,19 @@ MODE_3D = 3
 MAXCHANNELS = 72  # Copied from gps.h, but not required to match
 SIGNAL_STRENGTH_UNKNOWN = NaN
 
-WATCH_ENABLE    = 0x000001      # enable streaming
-WATCH_DISABLE   = 0x000002      # disable watching
-WATCH_JSON      = 0x000010      # JSON output
-WATCH_NMEA      = 0x000020      # output in NMEA
-WATCH_RARE      = 0x000040      # output of packets in hex
-WATCH_RAW       = 0x000080      # output of raw packets
-WATCH_SCALED    = 0x000100      # scale output to floats
-WATCH_TIMING    = 0x000200      # timing information
-WATCH_DEVICE    = 0x000800      # watch specific device
-WATCH_SPLIT24   = 0x001000      # split AIS Type 24s
-WATCH_PPS       = 0x002000      # enable PPS JSON
-WATCH_NEWSTYLE  = 0x010000      # force JSON streaming
-WATCH_OLDSTYLE  = 0x020000      # force old-style streaming
+WATCH_ENABLE = 0x000001        # enable streaming
+WATCH_DISABLE = 0x000002       # disable watching
+WATCH_JSON = 0x000010          # JSON output
+WATCH_NMEA = 0x000020          # output in NMEA
+WATCH_RARE = 0x000040          # output of packets in hex
+WATCH_RAW = 0x000080           # output of raw packets
+WATCH_SCALED = 0x000100        # scale output to floats
+WATCH_TIMING = 0x000200        # timing information
+WATCH_DEVICE = 0x000800        # watch specific device
+WATCH_SPLIT24 = 0x001000       # split AIS Type 24s
+WATCH_PPS = 0x002000           # enable PPS JSON
+WATCH_NEWSTYLE = 0x010000      # force JSON streaming
+WATCH_OLDSTYLE = 0x020000      # force old-style streaming
 
 
 class gpsfix(object):
@@ -118,8 +120,8 @@ class gpsdata(object):
 
         def __repr__(self):
             return "PRN: %3d  E: %3d  Az: %3d  Ss: %3d  Used: %s" % (
-                self.PRN, self.elevation, self.azimuth, self.ss, "ny"[self.used]
-            )
+                self.PRN, self.elevation, self.azimuth, self.ss,
+                "ny"[self.used])
 
     def __init__(self):
         # Initialize all data members
@@ -166,9 +168,9 @@ class gpsdata(object):
         else:
             st += "Track:    %f\n" % (self.fix.track)
         st += "Status:   STATUS_%s\n" \
-            % ("NO_FIX", "FIX", "DGPS_FIX")[self.status]
+              % ("NO_FIX", "FIX", "DGPS_FIX")[self.status]
         st += "Mode:     MODE_%s\n" \
-             % ("ZERO", "NO_FIX", "2D", "3D")[self.fix.mode]
+              % ("ZERO", "NO_FIX", "2D", "3D")[self.fix.mode]
         st += "Quality:  %d p=%2.2f h=%2.2f v=%2.2f t=%2.2f g=%2.2f\n" % \
               (self.satellites_used, self.pdop, self.hdop, self.vdop,
                self.tdop, self.gdop)
@@ -199,52 +201,55 @@ class gps(gpscommon, gpsdata, gpsjson):
             self.version = self.data
         elif self.data.get("class") == "DEVICE":
             self.valid = ONLINE_SET | DEVICE_SET
-            self.path        = self.data["path"]
-            self.activated   = default("activated", None)
+            self.path = self.data["path"]
+            self.activated = default("activated", None)
             driver = default("driver", None, DEVICEID_SET)
             subtype = default("subtype", None, DEVICEID_SET)
-            self.gps_id      = driver
+            self.gps_id = driver
             if subtype:
                 self.gps_id += " " + subtype
-            self.baudrate    = default("bps", 0)
-            self.cycle       = default("cycle",       NaN)
-            self.driver_mode = default("native",      0)
-            self.mincycle    = default("mincycle",    NaN)
-            self.serialmode  = default("serialmode", "8N1")
+            self.baudrate = default("bps", 0)
+            self.cycle = default("cycle", NaN)
+            self.driver_mode = default("native", 0)
+            self.mincycle = default("mincycle", NaN)
+            self.serialmode = default("serialmode", "8N1")
             # FIXME: decode DEVICSES
             # FIXME: decode PPS
         elif self.data.get("class") == "TPV":
             self.device = default("device", "missing")
-            self.utc    = default("time",   None, TIME_SET)
+            self.utc = default("time", None, TIME_SET)
             self.valid = ONLINE_SET
             if self.utc is not None:
                 # self.utc is always iso 8601 string
                 # just copy to fix.time
                 self.fix.time = self.utc
-            self.fix.altitude  = default("alt",    NaN, ALTITUDE_SET)
-            self.fix.climb     = default("climb",  NaN, CLIMB_SET)
-            self.fix.epc       = default("epc",    NaN, CLIMBERR_SET)
-            self.fix.epd       = default("epd",    NaN)
-            self.fix.eps       = default("eps",    NaN, SPEEDERR_SET)
-            self.fix.ept       = default("ept",    NaN, TIMERR_SET)
-            self.fix.epv       = default("epv",    NaN, VERR_SET)
-            self.fix.epx       = default("epx",    NaN, HERR_SET)
-            self.fix.epy       = default("epy",    NaN, HERR_SET)
-            self.fix.latitude  = default("lat",    NaN, LATLON_SET)
-            self.fix.longitude = default("lon",    NaN)
-            self.fix.mode      = default("mode",   0,   MODE_SET)
-            self.fix.speed     = default("speed",  NaN, SPEED_SET)
-            self.fix.status    = default("status", 1)
-            self.fix.track     = default("track",  NaN, TRACK_SET)
+            self.fix.altitude = default("alt", NaN, ALTITUDE_SET)
+            self.fix.climb = default("climb", NaN, CLIMB_SET)
+            self.fix.epc = default("epc", NaN, CLIMBERR_SET)
+            self.fix.epd = default("epd", NaN)
+            self.fix.eps = default("eps", NaN, SPEEDERR_SET)
+            self.fix.ept = default("ept", NaN, TIMERR_SET)
+            self.fix.epv = default("epv", NaN, VERR_SET)
+            self.fix.epx = default("epx", NaN, HERR_SET)
+            self.fix.epy = default("epy", NaN, HERR_SET)
+            self.fix.latitude = default("lat", NaN, LATLON_SET)
+            self.fix.longitude = default("lon", NaN)
+            self.fix.mode = default("mode", 0, MODE_SET)
+            self.fix.speed = default("speed", NaN, SPEED_SET)
+            self.fix.status = default("status", 1)
+            self.fix.track = default("track", NaN, TRACK_SET)
         elif self.data.get("class") == "SKY":
             self.device = default("device", "missing")
-            for attrp in ( "g", "h", "p", "t", "v", "x", "y"):
+            for attrp in ("g", "h", "p", "t", "v", "x", "y"):
                 n = attrp + "dop"
                 setattr(self, n, default(n, NaN, DOP_SET))
             if "satellites" in self.data.keys():
                 self.satellites = []
                 for sat in self.data['satellites']:
-                    self.satellites.append(gps.satellite(PRN=sat['PRN'], elevation=sat['el'], azimuth=sat['az'], ss=sat['ss'], used=sat['used']))
+                    self.satellites.append(gps.satellite(PRN=sat['PRN'],
+                                           elevation=sat['el'],
+                                           azimuth=sat['az'], ss=sat['ss'],
+                                           used=sat['used']))
             self.satellites_used = 0
             for sat in self.satellites:
                 if sat.used:
@@ -277,7 +282,8 @@ class gps(gpscommon, gpsdata, gpsjson):
 
     def stream(self, flags=0, devpath=None):
         "Ask gpsd to stream reports at your client."
-        if (flags & (WATCH_JSON | WATCH_OLDSTYLE | WATCH_NMEA | WATCH_RAW)) == 0:
+        if (flags & (WATCH_JSON | WATCH_OLDSTYLE | WATCH_NMEA
+                     | WATCH_RAW)) == 0:
             flags |= WATCH_JSON
         if flags & WATCH_DISABLE:
             if flags & WATCH_OLDSTYLE:
@@ -302,7 +308,8 @@ def is_sbas(prn):
     return prn >= 120 and prn <= 158
 
 if __name__ == '__main__':
-    import getopt, sys
+    import getopt
+    import sys
     (options, arguments) = getopt.getopt(sys.argv[1:], "v")
     streaming = False
     verbose = False