From fe9c2835ad73f577126ad1e5a9e42a642ba289e3 Mon Sep 17 00:00:00 2001 From: Frederic Junod Date: Fri, 14 Jul 2017 09:00:47 +0200 Subject: [PATCH 1/2] [engine] Add debug logging --- bumblebee/engine.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/bumblebee/engine.py b/bumblebee/engine.py index 9a6f68f..8499d2d 100644 --- a/bumblebee/engine.py +++ b/bumblebee/engine.py @@ -3,10 +3,13 @@ import os import time import pkgutil +import logging import importlib import bumblebee.error import bumblebee.modules +log = logging.getLogger(__name__) + try: from ConfigParser import SafeConfigParser except ImportError: @@ -42,6 +45,8 @@ class Module(object): self._configFile.read(cfg) break + if self._configFile is not None and self._configFile.has_section("module-parameters"): + log.debug(self._configFile.items("module-parameters")) self._widgets = [] if widgets: self._widgets = widgets if isinstance(widgets, list) else [widgets] From effea548ce18d5f4448c8862c02a51fd4650a684 Mon Sep 17 00:00:00 2001 From: Frederic Junod Date: Fri, 14 Jul 2017 09:01:13 +0200 Subject: [PATCH 2/2] [engine] Use RawConfigParser instead of SafeConfigParser To allow percent signs in the config file --- bumblebee/engine.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bumblebee/engine.py b/bumblebee/engine.py index 8499d2d..a4e63b8 100644 --- a/bumblebee/engine.py +++ b/bumblebee/engine.py @@ -11,9 +11,9 @@ import bumblebee.modules log = logging.getLogger(__name__) try: - from ConfigParser import SafeConfigParser + from ConfigParser import RawConfigParser except ImportError: - from configparser import SafeConfigParser + from configparser import RawConfigParser def all_modules(): """Return a list of available modules""" @@ -41,7 +41,7 @@ class Module(object): self._configFile = None for cfg in [ os.path.expanduser("~/.bumblebee-status.conf"), os.path.expanduser("~/.config/bumblebee-status.conf") ]: if os.path.exists(cfg): - self._configFile = SafeConfigParser() + self._configFile = RawConfigParser() self._configFile.read(cfg) break