From c72bfff3069e2b57b3c1283ca05ff2f77a0b1d3c Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Tue, 26 Aug 2014 20:38:10 +0200 Subject: [PATCH] Rename commands.exceptions to commands.cmdexc. --- qutebrowser/browser/commands.py | 3 +-- qutebrowser/browser/downloads.py | 2 +- qutebrowser/browser/hints.py | 3 +-- qutebrowser/browser/quickmarks.py | 2 +- qutebrowser/commands/{exceptions.py => cmdexc.py} | 0 qutebrowser/commands/command.py | 2 +- qutebrowser/commands/runners.py | 2 +- qutebrowser/commands/userscripts.py | 3 +-- qutebrowser/commands/utils.py | 3 +-- qutebrowser/config/config.py | 2 +- qutebrowser/keyinput/keyparser.py | 3 +-- qutebrowser/keyinput/modeman.py | 2 +- qutebrowser/utils/utilcmds.py | 3 +-- qutebrowser/widgets/statusbar/command.py | 3 +-- qutebrowser/widgets/tabbedbrowser.py | 2 +- qutebrowser/widgets/webview.py | 2 +- 16 files changed, 15 insertions(+), 22 deletions(-) rename qutebrowser/commands/{exceptions.py => cmdexc.py} (100%) diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py index 4b906e933..993216c7a 100644 --- a/qutebrowser/browser/commands.py +++ b/qutebrowser/browser/commands.py @@ -29,9 +29,8 @@ from PyQt5.QtGui import QClipboard from PyQt5.QtPrintSupport import QPrintDialog, QPrintPreviewDialog from PyQt5.QtWebKitWidgets import QWebInspector -from qutebrowser.commands import userscripts +from qutebrowser.commands import userscripts, cmdexc from qutebrowser.commands import utils as cmdutils -from qutebrowser.commands import exceptions as cmdexc 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 a6a7cbf7f..e7dca1956 100644 --- a/qutebrowser/browser/downloads.py +++ b/qutebrowser/browser/downloads.py @@ -28,8 +28,8 @@ 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 exceptions as cmdexc from qutebrowser.utils import message, http, usertypes, log, utils, qtutils diff --git a/qutebrowser/browser/hints.py b/qutebrowser/browser/hints.py index d3e586f3f..b8795021d 100644 --- a/qutebrowser/browser/hints.py +++ b/qutebrowser/browser/hints.py @@ -30,8 +30,7 @@ from PyQt5.QtWidgets import QApplication from qutebrowser.config import config from qutebrowser.keyinput import modeman from qutebrowser.utils import message, webelem -from qutebrowser.commands import userscripts -from qutebrowser.commands import exceptions as cmdexc +from qutebrowser.commands import userscripts, cmdexc from qutebrowser.utils import usertypes, log, qtutils diff --git a/qutebrowser/browser/quickmarks.py b/qutebrowser/browser/quickmarks.py index 194078741..7ad49e692 100644 --- a/qutebrowser/browser/quickmarks.py +++ b/qutebrowser/browser/quickmarks.py @@ -31,7 +31,7 @@ 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 exceptions as cmdexc +from qutebrowser.commands import cmdexc from qutebrowser.config import lineparser diff --git a/qutebrowser/commands/exceptions.py b/qutebrowser/commands/cmdexc.py similarity index 100% rename from qutebrowser/commands/exceptions.py rename to qutebrowser/commands/cmdexc.py diff --git a/qutebrowser/commands/command.py b/qutebrowser/commands/command.py index d3ce81b5a..2dec31f8a 100644 --- a/qutebrowser/commands/command.py +++ b/qutebrowser/commands/command.py @@ -22,7 +22,7 @@ from PyQt5.QtCore import QCoreApplication, QUrl from PyQt5.QtWebKit import QWebSettings -from qutebrowser.commands import exceptions as cmdexc +from qutebrowser.commands import cmdexc from qutebrowser.utils import log, utils diff --git a/qutebrowser/commands/runners.py b/qutebrowser/commands/runners.py index ac1bae1d8..124ec7975 100644 --- a/qutebrowser/commands/runners.py +++ b/qutebrowser/commands/runners.py @@ -24,7 +24,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.commands import cmdexc from qutebrowser.utils import message, log, utils diff --git a/qutebrowser/commands/userscripts.py b/qutebrowser/commands/userscripts.py index f9fd5aa19..b831ca00f 100644 --- a/qutebrowser/commands/userscripts.py +++ b/qutebrowser/commands/userscripts.py @@ -33,8 +33,7 @@ from PyQt5.QtCore import (pyqtSignal, QObject, QThread, QStandardPaths, QProcessEnvironment, QProcess, QUrl) from qutebrowser.utils import message, log, utils -from qutebrowser.commands import runners -from qutebrowser.commands import exceptions as cmdexc +from qutebrowser.commands import runners, cmdexc _runners = [] diff --git a/qutebrowser/commands/utils.py b/qutebrowser/commands/utils.py index 0cad46673..4fe0cc9d1 100644 --- a/qutebrowser/commands/utils.py +++ b/qutebrowser/commands/utils.py @@ -27,8 +27,7 @@ import inspect import collections from qutebrowser.utils import usertypes, qtutils -from qutebrowser.commands import command -from qutebrowser.commands import exceptions as cmdexc +from qutebrowser.commands import command, cmdexc cmd_dict = {} diff --git a/qutebrowser/config/config.py b/qutebrowser/config/config.py index aa9db0200..bd9a7bf3e 100644 --- a/qutebrowser/config/config.py +++ b/qutebrowser/config/config.py @@ -34,8 +34,8 @@ 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 exceptions as cmdexc from qutebrowser.utils import message from qutebrowser.utils.usertypes import Completion diff --git a/qutebrowser/keyinput/keyparser.py b/qutebrowser/keyinput/keyparser.py index 65010a0b6..bc1946a52 100644 --- a/qutebrowser/keyinput/keyparser.py +++ b/qutebrowser/keyinput/keyparser.py @@ -21,8 +21,7 @@ from qutebrowser.keyinput.basekeyparser import BaseKeyParser from qutebrowser.utils import message -from qutebrowser.commands import runners -from qutebrowser.commands import exceptions as cmdexc +from qutebrowser.commands import runners, cmdexc class CommandKeyParser(BaseKeyParser): diff --git a/qutebrowser/keyinput/modeman.py b/qutebrowser/keyinput/modeman.py index ba20dbcad..3c0b13f1c 100644 --- a/qutebrowser/keyinput/modeman.py +++ b/qutebrowser/keyinput/modeman.py @@ -28,8 +28,8 @@ 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 exceptions as cmdexc from qutebrowser.utils import usertypes from qutebrowser.utils import log diff --git a/qutebrowser/utils/utilcmds.py b/qutebrowser/utils/utilcmds.py index 07a897e71..b8172c37a 100644 --- a/qutebrowser/utils/utilcmds.py +++ b/qutebrowser/utils/utilcmds.py @@ -22,9 +22,8 @@ from functools import partial from qutebrowser.utils import usertypes -from qutebrowser.commands import runners +from qutebrowser.commands import runners, cmdexc from qutebrowser.commands import utils as cmdutils -from qutebrowser.commands import exceptions as cmdexc _timers = [] diff --git a/qutebrowser/widgets/statusbar/command.py b/qutebrowser/widgets/statusbar/command.py index f22a65b80..9437877f6 100644 --- a/qutebrowser/widgets/statusbar/command.py +++ b/qutebrowser/widgets/statusbar/command.py @@ -23,9 +23,8 @@ from PyQt5.QtCore import pyqtSignal, pyqtSlot from PyQt5.QtWidgets import QSizePolicy, QApplication from qutebrowser.keyinput import modeman, modeparsers -from qutebrowser.commands import runners +from qutebrowser.commands import runners, cmdexc from qutebrowser.commands import utils as cmdutils -from qutebrowser.commands import exceptions as cmdexc from qutebrowser.widgets import misc from qutebrowser.models import cmdhistory from qutebrowser.utils import usertypes, log diff --git a/qutebrowser/widgets/tabbedbrowser.py b/qutebrowser/widgets/tabbedbrowser.py index 39cd65582..5bbafda5a 100644 --- a/qutebrowser/widgets/tabbedbrowser.py +++ b/qutebrowser/widgets/tabbedbrowser.py @@ -27,8 +27,8 @@ 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 exceptions as cmdexc from qutebrowser.keyinput import modeman from qutebrowser.widgets import tabwidget, webview from qutebrowser.browser import signalfilter, commands diff --git a/qutebrowser/widgets/webview.py b/qutebrowser/widgets/webview.py index 7abdb6b81..7b7b47c1a 100644 --- a/qutebrowser/widgets/webview.py +++ b/qutebrowser/widgets/webview.py @@ -28,7 +28,7 @@ from qutebrowser.config import config from qutebrowser.keyinput import modeman from qutebrowser.utils import message, webelem, log, usertypes, utils, qtutils from qutebrowser.browser import webpage, hints -from qutebrowser.commands import exceptions as cmdexc +from qutebrowser.commands import cmdexc LoadStatus = usertypes.enum('LoadStatus', 'none', 'success', 'error', 'warn',