Rename commands.utils to commands.cmdutils.

doc/HACKING.asciidoc

@@ -306,7 +306,7 @@ Creating a new command is straightforward:
 
 [source,python]
 ----
-import qutebrowser.commands.utils as cmdutils
+import qutebrowser.commands.cmdutils
 
 ...
 

qutebrowser/app.py

@@ -35,8 +35,7 @@ from PyQt5.QtCore import (pyqtSlot, QTimer, QEventLoop, Qt, QStandardPaths,
                           qInstallMessageHandler, QObject, QUrl)
 
 import qutebrowser
-from qutebrowser.commands import userscripts, runners
-from qutebrowser.commands import utils as cmdutils
+from qutebrowser.commands import userscripts, runners, cmdutils
 from qutebrowser.config import (style, config, websettings, iniparsers,
                                 lineparser, conftypes)
 from qutebrowser.network import qutescheme, proxy

qutebrowser/browser/commands.py

@@ -29,8 +29,7 @@ from PyQt5.QtGui import QClipboard
 from PyQt5.QtPrintSupport import QPrintDialog, QPrintPreviewDialog
 from PyQt5.QtWebKitWidgets import QWebInspector
 
-from qutebrowser.commands import userscripts, cmdexc
-from qutebrowser.commands import utils as cmdutils
+from qutebrowser.commands import userscripts, cmdexc, cmdutils
 from qutebrowser.config import config
 from qutebrowser.browser import hints, quickmarks
 from qutebrowser.utils import (message, webelem, editor, usertypes, log,

qutebrowser/browser/downloads.py

@@ -28,8 +28,7 @@ from PyQt5.QtCore import pyqtSlot, pyqtSignal, QObject, QTimer, QStandardPaths
 from PyQt5.QtNetwork import QNetworkRequest, QNetworkReply
 
 from qutebrowser.config import config
-from qutebrowser.commands import cmdexc
-from qutebrowser.commands import utils as cmdutils
+from qutebrowser.commands import cmdexc, cmdutils
 from qutebrowser.utils import message, http, usertypes, log, utils, qtutils
 
 

qutebrowser/browser/quickmarks.py

@@ -30,8 +30,7 @@ import collections
 from PyQt5.QtCore import QStandardPaths, QUrl
 
 from qutebrowser.utils import message, usertypes, utils, qtutils
-from qutebrowser.commands import utils as cmdutils
-from qutebrowser.commands import cmdexc
+from qutebrowser.commands import cmdexc, cmdutils
 from qutebrowser.config import lineparser
 
 

qutebrowser/commands/runners.py

@@ -23,8 +23,7 @@ from PyQt5.QtCore import pyqtSlot, pyqtSignal, QObject
 from PyQt5.QtWebKitWidgets import QWebPage
 
 from qutebrowser.config import config
-from qutebrowser.commands import utils as cmdutils
-from qutebrowser.commands import cmdexc
+from qutebrowser.commands import cmdexc, cmdutils
 from qutebrowser.utils import message, log, utils
 
 

qutebrowser/config/config.py

@@ -34,8 +34,7 @@ from PyQt5.QtCore import pyqtSignal, QObject, QCoreApplication
 
 from qutebrowser.utils import log
 from qutebrowser.config import configdata, iniparsers, conftypes
-from qutebrowser.commands import cmdexc
-from qutebrowser.commands import utils as cmdutils
+from qutebrowser.commands import cmdexc, cmdutils
 from qutebrowser.utils import message
 from qutebrowser.utils.usertypes import Completion
 

qutebrowser/config/conftypes.py

@@ -29,7 +29,7 @@ from PyQt5.QtCore import QUrl
 from PyQt5.QtGui import QColor, QFont
 from PyQt5.QtNetwork import QNetworkProxy
 
-from qutebrowser.commands import utils as cmdutils
+from qutebrowser.commands import cmdutils
 
 
 SYSTEM_PROXY = object()  # Return value for Proxy type

qutebrowser/keyinput/modeman.py

@@ -28,8 +28,7 @@ from PyQt5.QtCore import pyqtSignal, pyqtSlot, QObject, QEvent
 from PyQt5.QtWidgets import QApplication
 
 from qutebrowser.config import config
-from qutebrowser.commands import cmdexc
-from qutebrowser.commands import utils as cmdutils
+from qutebrowser.commands import cmdexc, cmdutils
 from qutebrowser.utils import usertypes, log
 
 

qutebrowser/models/completion.py

@@ -23,8 +23,8 @@ from PyQt5.QtCore import pyqtSlot, Qt, QCoreApplication
 
 from qutebrowser.config import config, configdata
 from qutebrowser.models import basecompletion
-from qutebrowser.commands import utils as cmdutils
 from qutebrowser.utils import log, qtutils
+from qutebrowser.commands import cmdutils
 
 
 class SettingSectionCompletionModel(basecompletion.BaseCompletionModel):

qutebrowser/utils/completer.py

@@ -22,7 +22,7 @@
 from PyQt5.QtCore import pyqtSlot, pyqtSignal, QObject
 
 from qutebrowser.config import config, configdata
-from qutebrowser.commands import utils as cmdutils
+from qutebrowser.commands import cmdutils
 from qutebrowser.utils import usertypes, log
 from qutebrowser.models import completion as models
 from qutebrowser.models.completionfilter import CompletionFilterModel as CFM

qutebrowser/utils/debug.py

@@ -28,7 +28,7 @@ import functools
 from PyQt5.QtCore import pyqtRemoveInputHook, QEvent, QCoreApplication
 
 from qutebrowser.utils import log, utils
-from qutebrowser.commands import utils as cmdutils
+from qutebrowser.commands import cmdutils
 
 
 @cmdutils.register(debug=True, name='debug-set-trace')

qutebrowser/utils/readline.py

@@ -21,7 +21,7 @@
 
 from PyQt5.QtWidgets import QApplication, QLineEdit
 
-from qutebrowser.commands import utils as cmdutils
+from qutebrowser.commands import cmdutils
 from qutebrowser.utils import usertypes as typ
 
 

qutebrowser/utils/utilcmds.py

@@ -22,8 +22,7 @@
 from functools import partial
 
 from qutebrowser.utils import usertypes
-from qutebrowser.commands import runners, cmdexc
-from qutebrowser.commands import utils as cmdutils
+from qutebrowser.commands import runners, cmdexc, cmdutils
 
 
 _timers = []

qutebrowser/widgets/completion.py

@@ -26,7 +26,7 @@ subclasses to provide completions.
 from PyQt5.QtWidgets import QStyle, QTreeView, QSizePolicy
 from PyQt5.QtCore import pyqtSlot, pyqtSignal, Qt, QItemSelectionModel
 
-from qutebrowser.commands import utils as cmdutils
+from qutebrowser.commands import cmdutils
 from qutebrowser.config import config, style
 from qutebrowser.widgets import completiondelegate
 from qutebrowser.utils import completer, usertypes, qtutils

qutebrowser/widgets/mainwindow.py

@@ -25,7 +25,7 @@ import base64
 from PyQt5.QtCore import pyqtSlot, QRect, QPoint, QCoreApplication, QTimer
 from PyQt5.QtWidgets import QWidget, QVBoxLayout
 
-from qutebrowser.commands import utils as cmdutils
+from qutebrowser.commands import cmdutils
 from qutebrowser.config import config
 from qutebrowser.utils import message, log, usertypes, qtutils
 from qutebrowser.widgets import tabbedbrowser, completion, downloads

qutebrowser/widgets/statusbar/command.py

@@ -23,8 +23,7 @@ from PyQt5.QtCore import pyqtSignal, pyqtSlot
 from PyQt5.QtWidgets import QSizePolicy, QApplication
 
 from qutebrowser.keyinput import modeman, modeparsers
-from qutebrowser.commands import runners, cmdexc
-from qutebrowser.commands import utils as cmdutils
+from qutebrowser.commands import runners, cmdexc, cmdutils
 from qutebrowser.widgets import misc
 from qutebrowser.models import cmdhistory
 from qutebrowser.utils import usertypes, log

qutebrowser/widgets/statusbar/prompter.py

@@ -25,7 +25,7 @@ from PyQt5.QtCore import pyqtSlot, QTimer
 from PyQt5.QtWidgets import QLineEdit
 
 from qutebrowser.keyinput import modeman
-from qutebrowser.commands import utils as cmdutils
+from qutebrowser.commands import cmdutils
 from qutebrowser.utils import usertypes, log, qtutils
 
 

qutebrowser/widgets/tabbedbrowser.py

@@ -27,8 +27,7 @@ from PyQt5.QtGui import QIcon
 from PyQt5.QtWebKitWidgets import QWebPage
 
 from qutebrowser.config import config
-from qutebrowser.commands import cmdexc
-from qutebrowser.commands import utils as cmdutils
+from qutebrowser.commands import cmdexc, cmdutils
 from qutebrowser.keyinput import modeman
 from qutebrowser.widgets import tabwidget, webview
 from qutebrowser.browser import signalfilter, commands

scripts/generate_doc.py

@@ -36,7 +36,7 @@ import qutebrowser
 # We import qutebrowser.app so all @cmdutils-register decorators are run.
 import qutebrowser.app
 from qutebrowser import qutebrowser as qutequtebrowser
-from qutebrowser.commands import utils as cmdutils
+from qutebrowser.commands import cmdutils
 from qutebrowser.config import configdata
 from qutebrowser.utils import usertypes