From b5110b07f0e06efed4fa2f1807fca5c196105c22 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Tue, 13 Jun 2017 11:34:37 +0200 Subject: [PATCH] Fix newconfig init --- qutebrowser/config/config.py | 8 +------- qutebrowser/config/newconfig.py | 12 ++++++++++-- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/qutebrowser/config/config.py b/qutebrowser/config/config.py index f52578040..36b64dd29 100644 --- a/qutebrowser/config/config.py +++ b/qutebrowser/config/config.py @@ -248,12 +248,6 @@ def _init_misc(): QSettings.setPath(fmt, QSettings.UserScope, path) -def _init_new_config(parent): - new_config = newconfig.NewConfigManager(parent) - new_config.read_defaults() - objreg.register('config', new_config) - - def init(parent=None): """Initialize the config. @@ -263,7 +257,7 @@ def init(parent=None): global val # _init_main_config(parent) configdata.init() - _init_new_config(parent) + newconfig.init(parent) val = newconfig.val _init_key_config(parent) _init_misc() diff --git a/qutebrowser/config/newconfig.py b/qutebrowser/config/newconfig.py index 6dabf79e1..caf8594ea 100644 --- a/qutebrowser/config/newconfig.py +++ b/qutebrowser/config/newconfig.py @@ -24,7 +24,7 @@ from PyQt5.QtCore import pyqtSignal, QObject from qutebrowser.config import configdata -from qutebrowser.utils import utils +from qutebrowser.utils import utils, objreg # An easy way to access the config from other code via config.val.foo val = None @@ -66,7 +66,7 @@ class NewConfigManager(QObject): val = self._values[option] except KeyError as e: raise UnknownOptionError(e) - return val.typ.transform(val.default) + return val.typ.from_py(val.default) def is_valid_prefix(self, prefix): """Check whether the given prefix is a valid prefix for some option.""" @@ -115,3 +115,11 @@ class ConfigContainer: return '{}.{}'.format(self._prefix, attr) else: return attr + + +def init(parent): + new_config = NewConfigManager(parent) + new_config.read_defaults() + objreg.register('config', new_config) + global val + val = ConfigContainer(new_config)