From 6a8b1d51fa7326ac8080217c0bcfaf3d78c53cd7 Mon Sep 17 00:00:00 2001 From: Ryan Roden-Corrent Date: Sun, 19 Feb 2017 20:58:10 -0500 Subject: [PATCH] Avoid config -> configmodel circular import. Avoid the config dependency by using objreg.get('config') instead of config.get. --- qutebrowser/completion/models/configmodel.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qutebrowser/completion/models/configmodel.py b/qutebrowser/completion/models/configmodel.py index 406d8d572..7c7e3a0c6 100644 --- a/qutebrowser/completion/models/configmodel.py +++ b/qutebrowser/completion/models/configmodel.py @@ -19,8 +19,9 @@ """Functions that return config-related completion models.""" -from qutebrowser.config import config, configdata, configexc +from qutebrowser.config import configdata, configexc from qutebrowser.completion.models import base +from qutebrowser.utils import objreg def section(): @@ -54,6 +55,7 @@ def option(sectname): desc = "" else: desc = desc.splitlines()[0] + config = objreg.get('config') val = config.get(sectname, name, raw=True) model.new_item(cat, name, desc, val) return model @@ -68,6 +70,7 @@ def value(sectname, optname): """ model = base.CompletionModel(column_widths=(20, 70, 10)) cur_cat = model.new_category("Current/Default") + config = objreg.get('config') try: val = config.get(sectname, optname, raw=True) or '""' except (configexc.NoSectionError, configexc.NoOptionError):