Fix python 3 compatiblity in ingest

aossceilo/CONFIG.py

@@ -11,7 +11,7 @@ for a specified day.
 import os
 import re
 from datetime import datetime, timedelta
-#from metobs.util import RODict, CONFIG as c
+from metobscommon.util import RODict, CONFIG as c
 
 CEILO_INCOMING_DIR = os.environ.get( 'CEILO_INCOMING_DIR', '/beach/incoming/Instrument_Data/METOBS/RIG/Ceilo/raw')
 CEILO_PRAW_DIR =     os.environ.get( 'CEILO_PRAW_DIR', '/beach/raw/aoss/ceilo')

aossceilo/ingest.py

@@ -39,6 +39,8 @@ import serial
 # https://stackoverflow.com/a/13638084/433202
 TRACE_LEVEL_NUM = 9
 logging.addLevelName(TRACE_LEVEL_NUM, "TRACE")
+
+
 def debugv(self, message, *args, **kws):
     # Yes, logger takes its '*args' as 'args'.
     if self.isEnabledFor(TRACE_LEVEL_NUM):
@@ -47,16 +49,19 @@ logging.Logger.debugv = debugv
 
 LOG = logging.getLogger(__name__)
 
+
 def epoch_secs(dt):
     """Datetime to seconds from epoch.
     """
     return time.mktime(dt.utctimetuple())
 
+
 def is_header(line):
     """Is the line a valid message 2 header.
     """
     return re.match(r'^\x01CT[A-Z0-9][0-9]{2}[2].\x02\r\n$', line) 
 
+
 def process_lines(in_lines, ref_dt):
     """Process lines from the serial port. Epoch timestamps are injected
     before the message header. All lines are stripped of white space before 
@@ -72,6 +77,7 @@ def process_lines(in_lines, ref_dt):
         out_lines.append(line)
     return num_hdrs, out_lines
 
+
 def init_ceilo(portdev):
     """Initialize ceilometer by sending default configuration values to 
     instrument. When this completes the instrument should be in autosend mode
@@ -107,16 +113,17 @@ def init_ceilo(portdev):
                             stopbits=1, 
                             timeout=7.5)
 
+
 def read_cfg(cfgfile):
 
-    from ConfigParser import SafeConfigParser
-    parser = SafeConfigParser()
+    from configparser import ConfigParser
+    parser = ConfigParser()
     parser.read(cfgfile)
 
     return dict(parser.items('ct25k'))
 
-def main():
 
+def main():
     from argparse import ArgumentParser
     parser = ArgumentParser()
 
@@ -167,7 +174,7 @@ def main():
     datalog.fptr = None
 
     def handle_signal(*args, **kwargs):
-        LOG.warn("received TERM or INT")
+        LOG.warning("received TERM or INT")
     signal.signal(signal.SIGTERM, handle_signal)
     signal.signal(signal.SIGINT, handle_signal)
 
@@ -177,7 +184,6 @@ def main():
     LOG.info("starting ingest")
 
     while True:
-
         fptr = datalog()
         LOG.log(9, "got log %s", fptr.name)
 
@@ -200,7 +206,7 @@ def main():
 
     try:
         port.close()
-    except:
+    except (serial.SerialException, IOError, OSError):
         pass
 
 if __name__ == '__main__':