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

Avoid config/keyconf circular import.

Browse Source
This commit is contained in:
Ryan Roden-Corrent 2016-08-09 16:59:46 -04:00
parent 91ec5cc356
commit 30d2403b7f
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
qutebrowser/config/config.py
View File

@ -36,7 +36,7 @@ import collections.abc
from PyQt5.QtCore import pyqtSignal, QObject, QUrl, QSettings from PyQt5.QtCore import pyqtSignal, QObject, QUrl, QSettings
from qutebrowser.config import configdata, configexc, textwrapper 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.commands import cmdexc, cmdutils
from qutebrowser.utils import (message, objreg, utils, standarddir, log, from qutebrowser.utils import (message, objreg, utils, standarddir, log,
qtutils, error, usertypes) qtutils, error, usertypes)
@ -178,6 +178,7 @@ def _init_key_config(parent):
Args: Args:
parent: The parent to use for the KeyConfigParser. parent: The parent to use for the KeyConfigParser.
""" """
from qutebrowser.config.parsers import keyconf
args = objreg.get('args') args = objreg.get('args')
try: try:
key_config = keyconf.KeyConfigParser(standarddir.config(), 'keys.conf', key_config = keyconf.KeyConfigParser(standarddir.config(), 'keys.conf',