chg: dev: Py3 compatibility.

Author: ashmastaflash

requirements.txt

@@ -4,7 +4,7 @@ pyyaml==4.2b1
 geopy==1.18.1
 gps3==0.33.3
 hvac==0.7.1
-kalibrate==2.1.0
+kalibrate==2.2.1
 python-dateutil==2.7.5
 geoip2==2.9.0
 pyudev==0.21.0

sitch/sitchlib/device_detector.py

@@ -106,9 +106,9 @@ def interrogator(cls, match_list, port, test_command=None):
         time.sleep(2)
         serconn = serial.Serial(port, 4800, timeout=1)
         if test_command:
-            serconn.write(test_command)
+            serconn.write(test_command.encode("utf-8"))
         serconn.flush()
-        for i in xrange(10):
+        for i in range(10):
             line = None
             line = serconn.readline()
             if line is None:
@@ -137,6 +137,10 @@ def interrogator_matcher(cls, matchers, line):
         """
         match = False
         for m in matchers:
+            if not isinstance(m, bytes):
+                m = m.encode("utf-8")
+            if not isinstance(line, bytes):
+                line = line.encode("utf-8")
             if m in line:
                 match = True
         return match
@@ -177,17 +181,15 @@ def interrogate_gsm_modem(cls, port, command):
         time.sleep(2)
         serconn = serial.Serial(port, 4800, timeout=1)
         cmd = "%s\r\n" % command
-        serconn.write(cmd)
+        serconn.write(cmd.encode("utf-8"))
         serconn.flush()
-        for i in xrange(10):
+        for i in range(10):
             line = None
             line = serconn.readline()
             if line is None:
                 time.sleep(1)
-                pass
-            elif command in line:
+            elif command.encode("utf-8") in line:
                 time.sleep(1)
-                pass
             else:
                 serconn.flush()
                 serconn.close()

sitch/sitchlib/feed_manager.py

@@ -103,7 +103,7 @@ def get_newest_record_time(self, db_type):
                 print("FeedManager: Newest DB record timestamp is %s" % Utility.epoch_to_iso8601(result))  # NOQA
             else:
                 print("FeedManager: Unable to parse newest DB record timestamp: %s from %s" % (first_line, target_file))  # NOQA
-        return result
+        return int(result)
 
     def set_newest_record_time(self, db_type, timestamp):
         """Set the newest record time.

sitch/sitchlib/gsm_modem.py

@@ -46,7 +46,7 @@ def __iter__(self):
         page = []
         while True:
             line = None
-            line = self.serconn.readline()
+            line = self.serconn.readline().decode("utf-8")
             processed_line = self.process_line(line)
             if line is None:
                 pass
@@ -77,8 +77,8 @@ def eng_mode(self, status):
             print("GsmModem: Unsetting engineering mode, flushing")
             self.serial_write(self.unset_eng)
             while True:
-                output = self.serconn.readline()
-                if output == '':
+                output = self.serconn.readline().decode("utf-8")
+                if output:
                     break
                 else:
                     print(output)
@@ -87,7 +87,7 @@ def eng_mode(self, status):
             self.serial_write(self.eng_init)
         self.serconn.flush()
         time.sleep(2)
-        output = self.serconn.readline()
+        output = self.serconn.readline().decode("utf-8")
         print(output)
         self.serconn.flush()
 
@@ -96,9 +96,9 @@ def get_reg_info(self):
         self.serial_write(self.reg_info)
         self.serconn.flush()
         time.sleep(2)
-        output = self.serconn.readline()
+        output = self.serconn.readline().decode("utf-8")
         if "AT+" in output:
-            output = GsmModem.clean_operator_string(self.serconn.readline())
+            output = GsmModem.clean_operator_string(self.serconn.readline().decode("utf-8"))
         print(output)
         self.serconn.flush()
         return output
@@ -110,7 +110,7 @@ def dump_config(self):
         time.sleep(2)
         retval = []
         while True:
-            output = self.serconn.readline()
+            output = self.serconn.readline().decode("utf-8")
             if output == '':
                 break
             retval.append(str(output))
@@ -125,7 +125,7 @@ def get_imsi(self):
         time.sleep(2)
         retval = []
         while True:
-            output = self.serconn.readline()
+            output = self.serconn.readline().decode("utf-8")
             if output == '':
                 break
             if "AT+CIMI" in output:
@@ -163,7 +163,7 @@ def set_band(self, band):
             self.serial_write(term_command)
             self.serconn.flush()
             time.sleep(2)
-            output = self.serconn.readline()
+            output = self.serconn.readline().decode("utf-8")
             print(output)
             self.serconn.flush()
         else: