Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions src/vanguards/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,12 @@
from .logger import plog

try:
from configparser import SafeConfigParser, Error
from configparser import ConfigParser, Error
except ImportError:
from ConfigParser import SafeConfigParser, Error
class ConfigParser(SafeConfigParser):
def read_file(self, f, source=None):
return self.readfp(f, source)

################# Global options ##################

Expand Down Expand Up @@ -209,7 +212,7 @@ def set_options_from_module(config, module, section):
config.set(section, param, str(val))

def generate_config():
config = SafeConfigParser(allow_no_value=True)
config = ConfigParser(allow_no_value=True)
set_options_from_module(config, sys.modules[__name__], "Global")
set_options_from_module(config, vanguards, "Vanguards")
set_options_from_module(config, bandguards, "Bandguards")
Expand All @@ -219,9 +222,9 @@ def generate_config():
return config

def apply_config(config_file):
config = SafeConfigParser(allow_no_value=True)
config = ConfigParser(allow_no_value=True)

config.readfp(open(config_file, "r"))
config.read_file(open(config_file, "r"))

get_options_for_module(config, sys.modules[__name__], "Global")
get_options_for_module(config, vanguards, "Vanguards")
Expand Down