diff --git a/qutebrowser/app.py b/qutebrowser/app.py index 44e70fe2b..770ce9875 100644 --- a/qutebrowser/app.py +++ b/qutebrowser/app.py @@ -43,9 +43,8 @@ from qutebrowser.network import qutescheme, proxy from qutebrowser.browser import quickmarks, cookies, downloads from qutebrowser.widgets import mainwindow, console, crash from qutebrowser.keyinput import modeparsers, keyparser, modeman -from qutebrowser.utils import log, version, message, utilcmds, readline +from qutebrowser.utils import log, version, message, utilcmds, readline, utils from qutebrowser.utils import url as urlutils -from qutebrowser.utils import misc as utils from qutebrowser.utils import qt as qtutils from qutebrowser.utils import usertypes as utypes diff --git a/qutebrowser/browser/cookies.py b/qutebrowser/browser/cookies.py index b7359fdf1..398197a08 100644 --- a/qutebrowser/browser/cookies.py +++ b/qutebrowser/browser/cookies.py @@ -23,7 +23,7 @@ from PyQt5.QtNetwork import QNetworkCookie, QNetworkCookieJar from PyQt5.QtCore import QStandardPaths, QDateTime from qutebrowser.config import config, lineparser -from qutebrowser.utils import misc as utils +from qutebrowser.utils import utils class CookieJar(QNetworkCookieJar): diff --git a/qutebrowser/browser/downloads.py b/qutebrowser/browser/downloads.py index a26c1f23e..335e2b078 100644 --- a/qutebrowser/browser/downloads.py +++ b/qutebrowser/browser/downloads.py @@ -30,8 +30,7 @@ from PyQt5.QtNetwork import QNetworkRequest, QNetworkReply from qutebrowser.config import config from qutebrowser.commands import utils as cmdutils from qutebrowser.commands import exceptions as cmdexc -from qutebrowser.utils import message, http, usertypes, log -from qutebrowser.utils import misc as utils +from qutebrowser.utils import message, http, usertypes, log, utils from qutebrowser.utils import qt as qtutils diff --git a/qutebrowser/browser/quickmarks.py b/qutebrowser/browser/quickmarks.py index 5facf8468..7a24aec23 100644 --- a/qutebrowser/browser/quickmarks.py +++ b/qutebrowser/browser/quickmarks.py @@ -29,8 +29,7 @@ import collections from PyQt5.QtCore import QStandardPaths, QUrl -from qutebrowser.utils import message, usertypes -from qutebrowser.utils import misc as utils +from qutebrowser.utils import message, usertypes, utils from qutebrowser.utils import qt as qtutils from qutebrowser.commands import utils as cmdutils from qutebrowser.commands import exceptions as cmdexc diff --git a/qutebrowser/browser/webpage.py b/qutebrowser/browser/webpage.py index 42ebf1064..e72e82cb3 100644 --- a/qutebrowser/browser/webpage.py +++ b/qutebrowser/browser/webpage.py @@ -30,8 +30,7 @@ from PyQt5.QtWebKitWidgets import QWebPage from qutebrowser.config import config from qutebrowser.network import networkmanager -from qutebrowser.utils import message, usertypes, log, http -from qutebrowser.utils import misc as utils +from qutebrowser.utils import message, usertypes, log, http, utils from qutebrowser.utils import qt as qtutils diff --git a/qutebrowser/commands/command.py b/qutebrowser/commands/command.py index b35a48947..d3ce81b5a 100644 --- a/qutebrowser/commands/command.py +++ b/qutebrowser/commands/command.py @@ -23,8 +23,7 @@ from PyQt5.QtCore import QCoreApplication, QUrl from PyQt5.QtWebKit import QWebSettings from qutebrowser.commands import exceptions as cmdexc -from qutebrowser.utils import misc as utils -from qutebrowser.utils import log +from qutebrowser.utils import log, utils class Command: diff --git a/qutebrowser/commands/runners.py b/qutebrowser/commands/runners.py index 3e1b3330d..ac1bae1d8 100644 --- a/qutebrowser/commands/runners.py +++ b/qutebrowser/commands/runners.py @@ -25,8 +25,7 @@ from PyQt5.QtWebKitWidgets import QWebPage from qutebrowser.config import config from qutebrowser.commands import utils as cmdutils from qutebrowser.commands import exceptions as cmdexc -from qutebrowser.utils import message, log -from qutebrowser.utils import misc as utils +from qutebrowser.utils import message, log, utils class SearchRunner(QObject): diff --git a/qutebrowser/commands/userscripts.py b/qutebrowser/commands/userscripts.py index 644459156..f9fd5aa19 100644 --- a/qutebrowser/commands/userscripts.py +++ b/qutebrowser/commands/userscripts.py @@ -32,8 +32,7 @@ import functools from PyQt5.QtCore import (pyqtSignal, QObject, QThread, QStandardPaths, QProcessEnvironment, QProcess, QUrl) -from qutebrowser.utils import message, log -from qutebrowser.utils import misc as utils +from qutebrowser.utils import message, log, utils from qutebrowser.commands import runners from qutebrowser.commands import exceptions as cmdexc diff --git a/qutebrowser/config/style.py b/qutebrowser/config/style.py index 399fff534..29c52546a 100644 --- a/qutebrowser/config/style.py +++ b/qutebrowser/config/style.py @@ -29,8 +29,7 @@ import functools from PyQt5.QtGui import QColor from qutebrowser.config import config -from qutebrowser.utils import misc as utils -from qutebrowser.utils import log +from qutebrowser.utils import log, utils _colordict = None diff --git a/qutebrowser/config/websettings.py b/qutebrowser/config/websettings.py index 7c94a858c..ac9b32dd3 100644 --- a/qutebrowser/config/websettings.py +++ b/qutebrowser/config/websettings.py @@ -31,8 +31,7 @@ from PyQt5.QtWebKit import QWebSettings from PyQt5.QtCore import QStandardPaths from qutebrowser.config import config -from qutebrowser.utils import usertypes -from qutebrowser.utils import misc as utils +from qutebrowser.utils import usertypes, utils MapType = usertypes.enum('MapType', 'attribute', 'setter', 'static_setter') diff --git a/qutebrowser/keyinput/basekeyparser.py b/qutebrowser/keyinput/basekeyparser.py index f0215ede9..800428d50 100644 --- a/qutebrowser/keyinput/basekeyparser.py +++ b/qutebrowser/keyinput/basekeyparser.py @@ -26,8 +26,7 @@ import functools from PyQt5.QtCore import pyqtSignal, pyqtSlot, Qt, QObject from qutebrowser.config import config -from qutebrowser.utils import usertypes, log -from qutebrowser.utils import misc as utils +from qutebrowser.utils import usertypes, log, utils class BaseKeyParser(QObject): diff --git a/qutebrowser/network/qutescheme.py b/qutebrowser/network/qutescheme.py index 1025440ea..9a4577dda 100644 --- a/qutebrowser/network/qutescheme.py +++ b/qutebrowser/network/qutescheme.py @@ -30,9 +30,8 @@ from PyQt5.QtNetwork import QNetworkReply import qutebrowser from qutebrowser.network import schemehandler -from qutebrowser.utils import version +from qutebrowser.utils import version, utils from qutebrowser.utils import log as logutils -from qutebrowser.utils import misc as utils _HTML_TEMPLATE = """ diff --git a/qutebrowser/test/utils/test_misc.py b/qutebrowser/test/utils/test_misc.py index 71e9260c2..0ffcaa295 100644 --- a/qutebrowser/test/utils/test_misc.py +++ b/qutebrowser/test/utils/test_misc.py @@ -29,7 +29,7 @@ import tempfile from PyQt5.QtCore import QStandardPaths, QCoreApplication, Qt from PyQt5.QtGui import QColor -from qutebrowser.utils import misc as utils +from qutebrowser.utils import utils from qutebrowser.utils import qt as qtutils from qutebrowser.test import helpers diff --git a/qutebrowser/utils/debug.py b/qutebrowser/utils/debug.py index 37c730e92..557fe97a3 100644 --- a/qutebrowser/utils/debug.py +++ b/qutebrowser/utils/debug.py @@ -27,8 +27,7 @@ import functools from PyQt5.QtCore import pyqtRemoveInputHook, QEvent, QCoreApplication -from qutebrowser.utils import misc as utils -from qutebrowser.utils import log +from qutebrowser.utils import log, utils from qutebrowser.commands import utils as cmdutils diff --git a/qutebrowser/utils/misc.py b/qutebrowser/utils/utils.py similarity index 100% rename from qutebrowser/utils/misc.py rename to qutebrowser/utils/utils.py diff --git a/qutebrowser/utils/version.py b/qutebrowser/utils/version.py index 16f286143..6d65b27ad 100644 --- a/qutebrowser/utils/version.py +++ b/qutebrowser/utils/version.py @@ -29,8 +29,7 @@ from PyQt5.QtCore import QT_VERSION_STR, PYQT_VERSION_STR, qVersion from PyQt5.QtWebKit import qWebKitVersion import qutebrowser -from qutebrowser.utils import misc as utils -from qutebrowser.utils import log +from qutebrowser.utils import log, utils GPL_BOILERPLATE = """ diff --git a/qutebrowser/utils/webelem.py b/qutebrowser/utils/webelem.py index 2faea4e49..dcc2b7276 100644 --- a/qutebrowser/utils/webelem.py +++ b/qutebrowser/utils/webelem.py @@ -31,8 +31,7 @@ from PyQt5.QtCore import QRect, QUrl from PyQt5.QtWebKit import QWebElement from qutebrowser.config import config -from qutebrowser.utils import log, usertypes -from qutebrowser.utils import misc as utils +from qutebrowser.utils import log, usertypes, utils Group = usertypes.enum('Group', 'all', 'links', 'images', 'url', 'prevnext', diff --git a/qutebrowser/widgets/console.py b/qutebrowser/widgets/console.py index 6051070ad..d52a15e6e 100644 --- a/qutebrowser/widgets/console.py +++ b/qutebrowser/widgets/console.py @@ -27,7 +27,7 @@ from PyQt5.QtWidgets import QTextEdit, QWidget, QVBoxLayout, QApplication from qutebrowser.config import config from qutebrowser.models import cmdhistory -from qutebrowser.utils import misc as utils +from qutebrowser.utils import utils from qutebrowser.widgets import misc diff --git a/qutebrowser/widgets/crash.py b/qutebrowser/widgets/crash.py index 4bba8207a..237912378 100644 --- a/qutebrowser/widgets/crash.py +++ b/qutebrowser/widgets/crash.py @@ -29,8 +29,7 @@ from PyQt5.QtWidgets import (QDialog, QLabel, QTextEdit, QPushButton, QVBoxLayout, QHBoxLayout) from qutebrowser.config import config -from qutebrowser.utils import version, log -from qutebrowser.utils import misc as utils +from qutebrowser.utils import version, log, utils class _CrashDialog(QDialog): diff --git a/qutebrowser/widgets/tabbedbrowser.py b/qutebrowser/widgets/tabbedbrowser.py index c30cdf867..22c48f39e 100644 --- a/qutebrowser/widgets/tabbedbrowser.py +++ b/qutebrowser/widgets/tabbedbrowser.py @@ -32,8 +32,7 @@ from qutebrowser.commands import exceptions as cmdexc from qutebrowser.keyinput import modeman from qutebrowser.widgets import tabwidget, webview from qutebrowser.browser import signalfilter, commands -from qutebrowser.utils import log, message, usertypes -from qutebrowser.utils import misc as utils +from qutebrowser.utils import log, message, usertypes, utils from qutebrowser.utils import qt as qtutils diff --git a/qutebrowser/widgets/webview.py b/qutebrowser/widgets/webview.py index 301f0d67c..7f3ff32fa 100644 --- a/qutebrowser/widgets/webview.py +++ b/qutebrowser/widgets/webview.py @@ -26,8 +26,7 @@ from PyQt5.QtWebKitWidgets import QWebView, QWebPage from qutebrowser.config import config from qutebrowser.keyinput import modeman -from qutebrowser.utils import message, webelem, log, usertypes -from qutebrowser.utils import misc as utils +from qutebrowser.utils import message, webelem, log, usertypes, utils from qutebrowser.utils import qt as qtutils from qutebrowser.browser import webpage, hints from qutebrowser.commands import exceptions as cmdexc