Move config to config subfolder

qutebrowser/app.py

@@ -47,7 +47,7 @@ from PyQt5.QtCore import pyqtSlot, QTimer, QEventLoop
 
 import qutebrowser
 import qutebrowser.commands.utils as cmdutils
-import qutebrowser.utils.config as config
+import qutebrowser.config.config as config
 import qutebrowser.network.qutescheme as qutescheme
 from qutebrowser.widgets.mainwindow import MainWindow
 from qutebrowser.widgets.crash import CrashDialog

qutebrowser/commands/utils.py

@@ -24,7 +24,7 @@ from PyQt5.QtCore import pyqtSlot, pyqtSignal, QObject
 from PyQt5.QtWebKitWidgets import QWebPage
 
 import qutebrowser.commands.commands
-import qutebrowser.utils.config as config
+import qutebrowser.config.config as config
 from qutebrowser.commands.exceptions import (ArgumentCountError,
                                              NoSuchCommandError)
 

qutebrowser/config/__init__.py

@@ -0,0 +1,18 @@
+# Copyright 2014 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+#
+# This file is part of qutebrowser.
+#
+# qutebrowser is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# qutebrowser is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with qutebrowser.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Modules related to the configuration."""

qutebrowser/utils/url.py

@@ -24,7 +24,7 @@ import urllib.parse
 
 from PyQt5.QtCore import QUrl
 
-import qutebrowser.utils.config as config
+import qutebrowser.config.config as config
 
 
 def _get_search_url(txt):

qutebrowser/widgets/browser.py

@@ -35,7 +35,7 @@ from PyQt5.QtWebKit import QWebSettings
 from PyQt5.QtWebKitWidgets import QWebView, QWebPage
 
 import qutebrowser.utils.url as urlutils
-import qutebrowser.utils.config as config
+import qutebrowser.config.config as config
 from qutebrowser.widgets.tabbar import TabWidget
 from qutebrowser.network.networkmanager import NetworkManager
 from qutebrowser.utils.signals import SignalCache, dbg_signal

qutebrowser/widgets/completion.py

@@ -31,7 +31,7 @@ from PyQt5.QtCore import (pyqtSlot, pyqtSignal, Qt, QRect, QRectF, QPoint,
 from PyQt5.QtGui import (QIcon, QPalette, QTextDocument, QTextOption,
                          QTextCursor)
 
-import qutebrowser.utils.config as config
+import qutebrowser.config.config as config
 from qutebrowser.models.completionfilter import CompletionFilterModel
 from qutebrowser.models.commandcompletion import CommandCompletionModel
 

qutebrowser/widgets/crash.py

@@ -23,7 +23,7 @@ import traceback
 from PyQt5.QtWidgets import (QDialog, QLabel, QTextEdit, QPushButton,
                              QVBoxLayout, QHBoxLayout)
 
-import qutebrowser.utils.config as config
+import qutebrowser.config.config as config
 from qutebrowser.utils.version import version
 
 

qutebrowser/widgets/mainwindow.py

@@ -26,7 +26,7 @@ from PyQt5.QtWidgets import QWidget, QVBoxLayout
 from qutebrowser.widgets.statusbar import StatusBar
 from qutebrowser.widgets.browser import TabbedBrowser
 from qutebrowser.widgets.completion import CompletionView
-import qutebrowser.utils.config as config
+import qutebrowser.config.config as config
 
 
 class MainWindow(QWidget):

qutebrowser/widgets/statusbar.py

@@ -25,7 +25,7 @@ from PyQt5.QtWidgets import (QWidget, QLineEdit, QProgressBar, QLabel,
                              QShortcut)
 from PyQt5.QtGui import QPainter, QKeySequence, QValidator
 
-import qutebrowser.utils.config as config
+import qutebrowser.config.config as config
 import qutebrowser.commands.keys as keys
 from qutebrowser.utils.url import urlstring
 from qutebrowser.utils.usertypes import NeighborList

qutebrowser/widgets/tabbar.py

@@ -20,7 +20,7 @@
 from PyQt5.QtCore import Qt
 from PyQt5.QtWidgets import QTabWidget, QTabBar, QSizePolicy
 
-import qutebrowser.utils.config as config
+import qutebrowser.config.config as config
 from qutebrowser.utils.style import Style