rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Clean up ConfigManager __init__ and make it work with None.

Browse Source 
Fixes parts of #137.
This commit is contained in:
Florian Bruhin 2014-10-02 22:45:47 +02:00
parent 337574f40f
commit ab5acdc3ad
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
qutebrowser/config/config.py
View File

@ -175,9 +175,7 @@ class ConfigManager(QObject):
Attributes: Attributes:
sections: The configuration data as an OrderedDict. sections: The configuration data as an OrderedDict.
_fname: The filename to be opened. _fname: The filename to be opened.
_configparser: A ReadConfigParser instance to load the config.
_configdir: The dictionary to read the config from and save it in. _configdir: The dictionary to read the config from and save it in.
_configfile: The config file path.
_interpolation: An configparser.Interpolation object _interpolation: An configparser.Interpolation object
_proxies: configparser.SectionProxy objects for sections. _proxies: configparser.SectionProxy objects for sections.
_initialized: Whether the ConfigManager is fully initialized yet. _initialized: Whether the ConfigManager is fully initialized yet.
@ -196,15 +194,17 @@ class ConfigManager(QObject):
super().__init__(parent) super().__init__(parent)
self._initialized = False self._initialized = False
self.sections = configdata.DATA self.sections = configdata.DATA
self._configparser = iniparsers.ReadConfigParser(configdir, fname)
self._configfile = os.path.join(configdir, fname)
self._configdir = configdir
self._fname = fname
self._interpolation = configparser.ExtendedInterpolation() self._interpolation = configparser.ExtendedInterpolation()
self._proxies = {} self._proxies = {}
for sectname in self.sections.keys(): for sectname in self.sections.keys():
self._proxies[sectname] = SectionProxy(self, sectname) self._proxies[sectname] = SectionProxy(self, sectname)
self._from_cp(self._configparser) self._fname = fname
if configdir is None:
self._configdir = None
else:
self._configdir = configdir
parser = iniparsers.ReadConfigParser(configdir, fname)
self._from_cp(parser)
self._initialized = True self._initialized = True
def __getitem__(self, key): def __getitem__(self, key):
@ -508,10 +508,13 @@ class ConfigManager(QObject):
@cmdutils.register(instance='config') @cmdutils.register(instance='config')
def save(self): def save(self):
"""Save the config file.""" """Save the config file."""
if self._configdir is None:
return
if not os.path.exists(self._configdir): if not os.path.exists(self._configdir):
os.makedirs(self._configdir, 0o755) os.makedirs(self._configdir, 0o755)
log.destroy.debug("Saving config to {}".format(self._configfile)) configfile = os.path.join(configdir, self._fname)
with open(self._configfile, 'w', encoding='utf-8') as f: log.destroy.debug("Saving config to {}".format(configfile))
with open(configfile, 'w', encoding='utf-8') as f:
f.write(str(self)) f.write(str(self))
def dump_userconfig(self): def dump_userconfig(self):