From 30d2403b7f835ac985965f1ee41086e4cc4aded6 Mon Sep 17 00:00:00 2001 From: Ryan Roden-Corrent Date: Tue, 9 Aug 2016 16:59:46 -0400 Subject: [PATCH] Avoid config/keyconf circular import. --- qutebrowser/config/config.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/qutebrowser/config/config.py b/qutebrowser/config/config.py index a5521e275..ebee19c53 100644 --- a/qutebrowser/config/config.py +++ b/qutebrowser/config/config.py @@ -36,7 +36,7 @@ import collections.abc from PyQt5.QtCore import pyqtSignal, QObject, QUrl, QSettings from qutebrowser.config import configdata, configexc, textwrapper -from qutebrowser.config.parsers import ini, keyconf +from qutebrowser.config.parsers import ini from qutebrowser.commands import cmdexc, cmdutils from qutebrowser.utils import (message, objreg, utils, standarddir, log, qtutils, error, usertypes) @@ -178,6 +178,7 @@ def _init_key_config(parent): Args: parent: The parent to use for the KeyConfigParser. """ + from qutebrowser.config.parsers import keyconf args = objreg.get('args') try: key_config = keyconf.KeyConfigParser(standarddir.config(), 'keys.conf',