From 3b648a4c0de6b2c76aaa4606022633331f682bdf Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Sun, 23 Feb 2014 18:07:17 +0100 Subject: [PATCH] Move config to config subfolder --- qutebrowser/app.py | 2 +- qutebrowser/commands/utils.py | 2 +- qutebrowser/config/__init__.py | 18 ++++++++++++++++++ qutebrowser/{utils => config}/config.py | 0 qutebrowser/utils/url.py | 2 +- qutebrowser/widgets/browser.py | 2 +- qutebrowser/widgets/completion.py | 2 +- qutebrowser/widgets/crash.py | 2 +- qutebrowser/widgets/mainwindow.py | 2 +- qutebrowser/widgets/statusbar.py | 2 +- qutebrowser/widgets/tabbar.py | 2 +- 11 files changed, 27 insertions(+), 9 deletions(-) create mode 100644 qutebrowser/config/__init__.py rename qutebrowser/{utils => config}/config.py (100%) diff --git a/qutebrowser/app.py b/qutebrowser/app.py index 187fcfd92..e72713703 100644 --- a/qutebrowser/app.py +++ b/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 diff --git a/qutebrowser/commands/utils.py b/qutebrowser/commands/utils.py index f174b05e6..980ed5fc3 100644 --- a/qutebrowser/commands/utils.py +++ b/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) diff --git a/qutebrowser/config/__init__.py b/qutebrowser/config/__init__.py new file mode 100644 index 000000000..ae037430a --- /dev/null +++ b/qutebrowser/config/__init__.py @@ -0,0 +1,18 @@ +# Copyright 2014 Florian Bruhin (The Compiler) +# +# 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 . + +"""Modules related to the configuration.""" diff --git a/qutebrowser/utils/config.py b/qutebrowser/config/config.py similarity index 100% rename from qutebrowser/utils/config.py rename to qutebrowser/config/config.py diff --git a/qutebrowser/utils/url.py b/qutebrowser/utils/url.py index d496a8864..cd6a62327 100644 --- a/qutebrowser/utils/url.py +++ b/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): diff --git a/qutebrowser/widgets/browser.py b/qutebrowser/widgets/browser.py index 1f8de18ed..64acfa21f 100644 --- a/qutebrowser/widgets/browser.py +++ b/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 diff --git a/qutebrowser/widgets/completion.py b/qutebrowser/widgets/completion.py index 4066aec83..d9f97592b 100644 --- a/qutebrowser/widgets/completion.py +++ b/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 diff --git a/qutebrowser/widgets/crash.py b/qutebrowser/widgets/crash.py index ac7f2f718..18d2afb86 100644 --- a/qutebrowser/widgets/crash.py +++ b/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 diff --git a/qutebrowser/widgets/mainwindow.py b/qutebrowser/widgets/mainwindow.py index b2f1ebc0d..abd632ca6 100644 --- a/qutebrowser/widgets/mainwindow.py +++ b/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): diff --git a/qutebrowser/widgets/statusbar.py b/qutebrowser/widgets/statusbar.py index d79649a9c..65b54d130 100644 --- a/qutebrowser/widgets/statusbar.py +++ b/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 diff --git a/qutebrowser/widgets/tabbar.py b/qutebrowser/widgets/tabbar.py index 3ab6dfcde..2e4b0b40e 100644 --- a/qutebrowser/widgets/tabbar.py +++ b/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