Change the name of the internal gps.client module to gps.clienthelpers.

We're going to actually expose a module with the name gps.client, so this
has to get out of the way

1 files changed, 13 insertions, 13 deletions

diff --git a/xgps b/xgps
index 32b9c4ac..37ddfc83 100755
--- a/xgps
+++ b/xgps
@@ -20,7 +20,7 @@ import gobject, pygtk
 pygtk.require('2.0')
 import gtk
 
-import gps, gps.client
+import gps, gps.clienthelpers
 
 class unit_adjustments:
     "Encapsulate adjustments for unit systems."
@@ -30,15 +30,15 @@ class unit_adjustments:
         self.speedfactor = gps.MPS_TO_MPH
         self.speedunits = "mph"
         if units is None:
-            units = gps.client.gpsd_units()
-        if units in (gps.client.unspecified, gps.client.imperial, "imperial", "i"):
+            units = gps.clienthelpers.gpsd_units()
+        if units in (gps.clienthelpers.unspecified, gps.clienthelpers.imperial, "imperial", "i"):
             pass
-        elif units in (gps.client.nautical, "nautical", "n"):
+        elif units in (gps.clienthelpers.nautical, "nautical", "n"):
             self.altfactor = gps.METERS_TO_FEET
             self.altunits = "ft"
             self.speedfactor = gps.MPS_TO_KNOTS
             self.speedunits = "knots"
-        elif units in (gps.client.metric, "metric", "m"):
+        elif units in (gps.clienthelpers.metric, "metric", "m"):
             self.altfactor = 1
             self.altunits = "m"
             self.speedfactor = gps.MPS_TO_KPH
@@ -230,7 +230,7 @@ class AISView:
         else:
             latsuff = ""
         lat = abs(lat)
-        lat = gps.client.deg_to_str(self.deg_type, lat)
+        lat = gps.clienthelpers.deg_to_str(self.deg_type, lat)
         if lon < 0:
             lonsuff = "W"
         elif lon > 0:
@@ -238,7 +238,7 @@ class AISView:
         else:
             lonsuff = ""
         lon = abs(lon)
-        lon = gps.client.deg_to_str(gps.client.deg_ddmmss, lon)
+        lon = gps.clienthelpers.deg_to_str(gps.clienthelpers.deg_ddmmss, lon)
         return lat + latsuff + "/" + lon + lonsuff
 
     def update(self, ais):
@@ -485,7 +485,7 @@ class Base:
 
     def update_latitude(self, data):
         if data.mode >= gps.MODE_2D:
-            lat = gps.client.deg_to_str(self.deg_type, abs(data.lat))
+            lat = gps.clienthelpers.deg_to_str(self.deg_type, abs(data.lat))
             if data.lat < 0:
                 ns = 'S'
             else:
@@ -496,7 +496,7 @@ class Base:
 
     def update_longitude(self, data):
         if data.mode >= gps.MODE_2D:
-            lon = gps.client.deg_to_str(self.deg_type, abs(data.lon))
+            lon = gps.clienthelpers.deg_to_str(self.deg_type, abs(data.lon))
             if data.lon < 0:
                 ew = 'W'
             else:
@@ -531,7 +531,7 @@ class Base:
 
     def update_track(self, data):
         if hasattr(data, "track"):
-            return gps.client.deg_to_str(self.deg_type, abs(data.track))
+            return gps.clienthelpers.deg_to_str(self.deg_type, abs(data.track))
         else:
             return "n/a"
 
@@ -648,9 +648,9 @@ if __name__ == "__main__":
             sys.stderr.write("xgps 1.0\n")
             sys.exit(0)
 
-    degreefmt = {'d':gps.client.deg_dd,
-                 'm':gps.client.deg_ddmm,
-                 's':gps.client.deg_ddmmss}[degreefmt]
+    degreefmt = {'d':gps.clienthelpers.deg_dd,
+                 'm':gps.clienthelpers.deg_ddmm,
+                 's':gps.clienthelpers.deg_ddmmss}[degreefmt]
 
     (host, port, device) = ("localhost", "2947", None)
     if len(arguments):