Peter Surda
8bcfe80ad0
- got rid of shared config parser and made it into a singleton - refactored safeConfigGetBoolean as a method of the config singleton - refactored safeConfigGet as a method of the config singleton - moved softwareVersion from shared.py into version.py - moved some global variables from shared.py into state.py - moved some protocol-specific functions from shared.py into protocol.py
39 lines
1.4 KiB
Python
39 lines
1.4 KiB
Python
import ConfigParser
|
|
|
|
from singleton import Singleton
|
|
|
|
|
|
@Singleton
|
|
class BMConfigParser(ConfigParser.SafeConfigParser):
|
|
def set(self, section, option, value=None):
|
|
if self._optcre is self.OPTCRE or value:
|
|
if not isinstance(value, basestring):
|
|
raise TypeError("option values must be strings")
|
|
return ConfigParser.ConfigParser.set(self, section, option, value)
|
|
|
|
def get(self, section, option, raw=False, vars=None):
|
|
if section == "bitmessagesettings" and option == "timeformat":
|
|
try:
|
|
return ConfigParser.ConfigParser.get(self, section, option, raw, vars)
|
|
except ConfigParser.InterpolationError:
|
|
return ConfigParser.ConfigParser.get(self, section, option, True, vars)
|
|
return ConfigParser.ConfigParser.get(self, section, option, True, vars)
|
|
|
|
def safeGetBoolean(self, section, field):
|
|
if self.has_option(section, field):
|
|
try:
|
|
return self.getboolean(section, field)
|
|
except ValueError:
|
|
return False
|
|
return False
|
|
|
|
def safeGet(self, section, option, default = None):
|
|
if self.has_option(section, option):
|
|
return self.get(section, option)
|
|
else:
|
|
return default
|
|
|
|
def items(self, section, raw=False, vars=None):
|
|
return ConfigParser.ConfigParser.items(self, section, True, vars)
|
|
|