l.behm/bumblebee-status
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #141 from fredj/RawConfigParser

Browse source 
[engine] Use RawConfigParser instead of SafeConfigParser
This commit is contained in:
tobi-wan-kenobi 2017-07-14 17:05:33 +02:00 • committed by GitHub
commit 0eca3b8de8
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
bumblebee/engine.py
View file

@ -3,14 +3,17 @@
import os import os
import time import time
import pkgutil import pkgutil
import logging
import importlib import importlib
import bumblebee.error import bumblebee.error
import bumblebee.modules import bumblebee.modules
log = logging.getLogger(__name__)
try: try:
from ConfigParser import SafeConfigParser from ConfigParser import RawConfigParser
except ImportError: except ImportError:
from configparser import SafeConfigParser from configparser import RawConfigParser
def all_modules(): def all_modules():
"""Return a list of available modules""" """Return a list of available modules"""
@ -38,10 +41,12 @@ class Module(object):
self._configFile = None self._configFile = None
for cfg in [ os.path.expanduser("~/.bumblebee-status.conf"), os.path.expanduser("~/.config/bumblebee-status.conf") ]: for cfg in [ os.path.expanduser("~/.bumblebee-status.conf"), os.path.expanduser("~/.config/bumblebee-status.conf") ]:
if os.path.exists(cfg): if os.path.exists(cfg):
self._configFile = SafeConfigParser() self._configFile = RawConfigParser()
self._configFile.read(cfg) self._configFile.read(cfg)
break break
if self._configFile is not None and self._configFile.has_section("module-parameters"):
log.debug(self._configFile.items("module-parameters"))
self._widgets = [] self._widgets = []
if widgets: if widgets:
self._widgets = widgets if isinstance(widgets, list) else [widgets] self._widgets = widgets if isinstance(widgets, list) else [widgets]