Rename utils.misc to utils.utils

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
 

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):

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
 
 

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

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
 
 

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:

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):

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
 

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

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')
 

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):

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 = """

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
 

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
 
 

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 = """

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',

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
 
 

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):

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
 
 

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