migrate configuration system to the stdlib ConfigParser

diff --git a/logparse/parsers/temperature.py b/logparse/parsers/temperature.py
index d1d4058b0f88719544ee04c86f2ee80ea100a1a7..ebca1ac1eb5ece03125f1d7b3703547f078a1671 100644 (file)
--- a/logparse/parsers/temperature.py
+++ b/logparse/parsers/temperature.py
@@ -18,10 +18,9 @@ import socket, sys
 from telnetlib import Telnet
 from typing import List, Dict, NamedTuple
 
-from logparse import formatting
-from ..formatting import *
-from ..util import readlog, resolve
-from ..config import * 
+from logparse.formatting import *
+from logparse.util import readlog
+from logparse import config
 
 import logging
 logger = logging.getLogger(__name__)
@@ -124,14 +123,18 @@ def parse_log():
     data = ""
     hddtemp_data = Data("Disks")
     
-    client = HddtempClient(host=config.prefs['hddtemp']['host'], port=int(config.prefs['hddtemp']['port']), sep=config.prefs['hddtemp']['separator'], timeout=int(config.prefs['hddtemp']['timeout']))
+    client = HddtempClient(
+        host=config.prefs.get("temperatures", "host"),
+        port=config.prefs.getint("temperatures", "port"),
+        sep=config.prefs.get("temperatures", "separator"),
+        timeout=int(config.prefs.get("temperatures", "timeout")))
     drives = client.get_drives()
     logger.debug("Received drive info: " + str(drives))
 
     for drive in sorted(drives, key=lambda x: x.path):
-        if drive.path in config.prefs['hddtemp']['drives']:
+        if drive.path in config.prefs.get("temperatures", "drives").split():
             sumtemp += drive.temperature
-            hddtemp_data.items.append(("{0} ({1})".format(drive.path, drive.model) if config.prefs['hddtemp']['show-model'] else drive.path) + ": {0}{1}{2}".format(drive.temperature, DEG, drive.units))
+            hddtemp_data.items.append(("{0} ({1})".format(drive.path, drive.model) if config.prefs.getboolean("temperatures", "show-model") else drive.path) + ": {0}{1}{2}".format(drive.temperature, DEG, drive.units))
         else:
             drives.remove(drive)
             logger.debug("Ignoring drive {0} ({1}) due to config".format(drive.path, drive.model))