From ce4a5affa478cc1635ba920ccbcb039aba01c913 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 26 Aug 2014 20:48:39 +0200
Subject: [PATCH] Rename commands.utils to commands.cmdutils.

---
 doc/HACKING.asciidoc                           | 2 +-
 qutebrowser/app.py                             | 3 +--
 qutebrowser/browser/commands.py                | 3 +--
 qutebrowser/browser/downloads.py               | 3 +--
 qutebrowser/browser/quickmarks.py              | 3 +--
 qutebrowser/commands/{utils.py => cmdutils.py} | 0
 qutebrowser/commands/runners.py                | 3 +--
 qutebrowser/config/config.py                   | 3 +--
 qutebrowser/config/conftypes.py                | 2 +-
 qutebrowser/keyinput/modeman.py                | 3 +--
 qutebrowser/models/completion.py               | 2 +-
 qutebrowser/utils/completer.py                 | 2 +-
 qutebrowser/utils/debug.py                     | 2 +-
 qutebrowser/utils/readline.py                  | 2 +-
 qutebrowser/utils/utilcmds.py                  | 3 +--
 qutebrowser/widgets/completion.py              | 2 +-
 qutebrowser/widgets/mainwindow.py              | 2 +-
 qutebrowser/widgets/statusbar/command.py       | 3 +--
 qutebrowser/widgets/statusbar/prompter.py      | 2 +-
 qutebrowser/widgets/tabbedbrowser.py           | 3 +--
 scripts/generate_doc.py                        | 2 +-
 21 files changed, 20 insertions(+), 30 deletions(-)
 rename qutebrowser/commands/{utils.py => cmdutils.py} (100%)

diff --git a/doc/HACKING.asciidoc b/doc/HACKING.asciidoc
index cb14edfbd..c1e4876b7 100644
--- a/doc/HACKING.asciidoc
+++ b/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
 
 ...
 
diff --git a/qutebrowser/app.py b/qutebrowser/app.py
index 33497d449..90e060d06 100644
--- a/qutebrowser/app.py
+++ b/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
diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 993216c7a..016b32bb7 100644
--- a/qutebrowser/browser/commands.py
+++ b/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,
diff --git a/qutebrowser/browser/downloads.py b/qutebrowser/browser/downloads.py
index e7dca1956..7d2d51b77 100644
--- a/qutebrowser/browser/downloads.py
+++ b/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
 
 
diff --git a/qutebrowser/browser/quickmarks.py b/qutebrowser/browser/quickmarks.py
index 7ad49e692..ec223749e 100644
--- a/qutebrowser/browser/quickmarks.py
+++ b/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
 
 
diff --git a/qutebrowser/commands/utils.py b/qutebrowser/commands/cmdutils.py
similarity index 100%
rename from qutebrowser/commands/utils.py
rename to qutebrowser/commands/cmdutils.py
diff --git a/qutebrowser/commands/runners.py b/qutebrowser/commands/runners.py
index 124ec7975..95d00e4b7 100644
--- a/qutebrowser/commands/runners.py
+++ b/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
 
 
diff --git a/qutebrowser/config/config.py b/qutebrowser/config/config.py
index bd9a7bf3e..b704e9e46 100644
--- a/qutebrowser/config/config.py
+++ b/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
 
diff --git a/qutebrowser/config/conftypes.py b/qutebrowser/config/conftypes.py
index 05d6c69e2..fada5ae1b 100644
--- a/qutebrowser/config/conftypes.py
+++ b/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
diff --git a/qutebrowser/keyinput/modeman.py b/qutebrowser/keyinput/modeman.py
index 79c7dc6da..996eddc29 100644
--- a/qutebrowser/keyinput/modeman.py
+++ b/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
 
 
diff --git a/qutebrowser/models/completion.py b/qutebrowser/models/completion.py
index 71a3f0710..6e09fca3d 100644
--- a/qutebrowser/models/completion.py
+++ b/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):
diff --git a/qutebrowser/utils/completer.py b/qutebrowser/utils/completer.py
index b3db400a4..55674e17e 100644
--- a/qutebrowser/utils/completer.py
+++ b/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
diff --git a/qutebrowser/utils/debug.py b/qutebrowser/utils/debug.py
index 557fe97a3..9ac38c832 100644
--- a/qutebrowser/utils/debug.py
+++ b/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')
diff --git a/qutebrowser/utils/readline.py b/qutebrowser/utils/readline.py
index 71f102a64..7390c314e 100644
--- a/qutebrowser/utils/readline.py
+++ b/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
 
 
diff --git a/qutebrowser/utils/utilcmds.py b/qutebrowser/utils/utilcmds.py
index b8172c37a..0bb31769c 100644
--- a/qutebrowser/utils/utilcmds.py
+++ b/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 = []
diff --git a/qutebrowser/widgets/completion.py b/qutebrowser/widgets/completion.py
index 165de13a5..04f7b5d34 100644
--- a/qutebrowser/widgets/completion.py
+++ b/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
diff --git a/qutebrowser/widgets/mainwindow.py b/qutebrowser/widgets/mainwindow.py
index 9d0fafb1d..32ad27374 100644
--- a/qutebrowser/widgets/mainwindow.py
+++ b/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
diff --git a/qutebrowser/widgets/statusbar/command.py b/qutebrowser/widgets/statusbar/command.py
index 9437877f6..ef4be8098 100644
--- a/qutebrowser/widgets/statusbar/command.py
+++ b/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
diff --git a/qutebrowser/widgets/statusbar/prompter.py b/qutebrowser/widgets/statusbar/prompter.py
index f4fa94e39..118502aea 100644
--- a/qutebrowser/widgets/statusbar/prompter.py
+++ b/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
 
 
diff --git a/qutebrowser/widgets/tabbedbrowser.py b/qutebrowser/widgets/tabbedbrowser.py
index 5bbafda5a..653aff25f 100644
--- a/qutebrowser/widgets/tabbedbrowser.py
+++ b/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
diff --git a/scripts/generate_doc.py b/scripts/generate_doc.py
index 136f393fd..fcd777cda 100755
--- a/scripts/generate_doc.py
+++ b/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