From b36cf0572dca4a0cd64a8a1f5539ddc61dc18372 Mon Sep 17 00:00:00 2001 From: Ryan Roden-Corrent Date: Mon, 19 Sep 2016 12:44:51 -0400 Subject: [PATCH] Avoid potential circular import in config.py. There was a circular import from config -> keyconf -> miscmodels -> config. This is resolved by scoping config's keyconf import to the one function that uses it. --- qutebrowser/config/config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qutebrowser/config/config.py b/qutebrowser/config/config.py index 587da214f..bb52a2417 100644 --- a/qutebrowser/config/config.py +++ b/qutebrowser/config/config.py @@ -38,7 +38,6 @@ from PyQt5.QtCore import pyqtSignal, QObject, QUrl, QSettings from PyQt5.QtGui import QColor from qutebrowser.config import configdata, configexc, textwrapper -from qutebrowser.config.parsers import keyconf from qutebrowser.config.parsers import ini from qutebrowser.commands import cmdexc, cmdutils from qutebrowser.utils import (message, objreg, utils, standarddir, log, @@ -181,6 +180,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',