Switch to Python 3 and Gtk 3

[~andy/csm213a-hw] / vis / config.py

diff --git a/vis/config.py b/vis/config.py
index b40d09bef7256c9e923e082c5c2f00f00c2825bb..71dd99e5e35c98fe9cb8cbb54033541d53783927 100644 (file)
--- a/vis/config.py
+++ b/vis/config.py
@@ -1,13 +1,15 @@
-from ConfigParser import ConfigParser
+from configparser import ConfigParser
 
 class Config:
        # Attributes
        filename = "settings.cfg"
 
        defaults = {
+               'baudrate': '/dev/ttyACM0',
                'baudrate': '9600',
-               'stopbits': '1',
+               'parity':   'N',
                'databits': '8',
+               'stopbits': '1',
                'username': '<username>',
                'password': '<password>',
                'apikey':   '<apikey>',
@@ -24,9 +26,11 @@ class Config:
        def load(self):
                self.parser.read(self.filename)
 
+               self.device   = self.parser.get('serial', 'device')
                self.baudrate = self.parser.getint('serial', 'baudrate')
-               self.stopbits = self.parser.getint('serial', 'stopbits')
+               self.parity   = self.parser.get('serial', 'parity')
                self.databits = self.parser.getint('serial', 'databits')
+               self.stopbits = self.parser.getint('serial', 'stopbits')
 
                self.username = self.parser.get('xively', 'username')
                self.password = self.parser.get('xively', 'password')