From fe230219a9b176301ab76d2e0c398e4e22e59a6b Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Tue, 4 Oct 2016 18:34:25 +0200 Subject: [PATCH] Fix lint --- .../browser/webkit/network/networkmanager.py | 4 +-- qutebrowser/browser/webkit/webpage.py | 5 ++-- qutebrowser/mainwindow/prompt.py | 29 ++++++++++++++----- qutebrowser/utils/message.py | 4 +-- 4 files changed, 29 insertions(+), 13 deletions(-) diff --git a/qutebrowser/browser/webkit/network/networkmanager.py b/qutebrowser/browser/webkit/network/networkmanager.py index e1026a8ab..4c5a91fa4 100644 --- a/qutebrowser/browser/webkit/network/networkmanager.py +++ b/qutebrowser/browser/webkit/network/networkmanager.py @@ -231,8 +231,8 @@ class NetworkManager(QNetworkAccessManager): tab=self._tab_id) abort_on.append(tab.load_started) - return message.ask(win_id=self._win_id, title=title, text=text, mode=mode, - abort_on=abort_on) + return message.ask(win_id=self._win_id, title=title, text=text, + mode=mode, abort_on=abort_on) def shutdown(self): """Abort all running requests.""" diff --git a/qutebrowser/browser/webkit/webpage.py b/qutebrowser/browser/webkit/webpage.py index 5c5bef83f..e5cbf8e01 100644 --- a/qutebrowser/browser/webkit/webpage.py +++ b/qutebrowser/browser/webkit/webpage.py @@ -340,8 +340,9 @@ class BrowserPage(QWebPage): self.loadStarted], title='Permission request', text=text) - self.featurePermissionRequestCanceled.connect(functools.partial( - self.on_feature_permission_cancelled, question, frame, feature)) + self.featurePermissionRequestCanceled.connect( + functools.partial(self.on_feature_permission_cancelled, + question, frame, feature)) elif config_val: self.setFeaturePermission(frame, feature, QWebPage.PermissionGrantedByUser) diff --git a/qutebrowser/mainwindow/prompt.py b/qutebrowser/mainwindow/prompt.py index 447e1c46d..88a8d6fd9 100644 --- a/qutebrowser/mainwindow/prompt.py +++ b/qutebrowser/mainwindow/prompt.py @@ -26,10 +26,9 @@ import collections import sip from PyQt5.QtCore import pyqtSlot, pyqtSignal, Qt, QTimer from PyQt5.QtWidgets import (QWidget, QGridLayout, QVBoxLayout, QLineEdit, - QLabel, QSpacerItem, QWidgetItem, - QFileSystemModel, QTreeView) + QLabel, QWidgetItem, QFileSystemModel, QTreeView) -from qutebrowser.config import style, config +from qutebrowser.config import style from qutebrowser.utils import usertypes, log, utils, qtutils, objreg from qutebrowser.keyinput import modeman from qutebrowser.commands import cmdutils, cmdexc @@ -246,7 +245,6 @@ class PromptContainer(QWidget): if question.answer is None and not question.is_aborted: question.cancel() - @cmdutils.register(instance='prompt-container', hide=True, scope='window', modes=[usertypes.KeyMode.prompt], maxsplit=0) def prompt_open_download(self, cmdline: str=None): @@ -331,6 +329,8 @@ class PromptContainer(QWidget): class LineEdit(QLineEdit): + """A line edit used in prompts.""" + def __init__(self, parent=None): super().__init__(parent) self.setStyleSheet(""" @@ -430,6 +430,8 @@ class _BasePrompt(QWidget): class LineEditPrompt(_BasePrompt): + """A prompt for a single text value.""" + def __init__(self, question, win_id, parent=None): super().__init__(question, win_id, parent) self._lineedit = LineEdit(self) @@ -452,6 +454,8 @@ class LineEditPrompt(_BasePrompt): class FilenamePrompt(_BasePrompt): + """A prompt for a filename.""" + def __init__(self, question, win_id, parent=None): super().__init__(question, win_id, parent) self._init_title(question) @@ -468,12 +472,17 @@ class FilenamePrompt(_BasePrompt): self._init_key_label() def sizeHint(self): + """Get some more width. + + FIXME do this properly... + """ orig = super().sizeHint() orig.setWidth(orig.width() * 3) return orig @pyqtSlot(str) def _set_fileview_root(self, path): + """Set the root path for the file display.""" try: if os.path.isdir(path): path = path @@ -508,7 +517,7 @@ class FilenamePrompt(_BasePrompt): class DownloadFilenamePrompt(FilenamePrompt): - # FIXME have a FilenamePrompt + """A prompt for a filename for downloads.""" def accept(self, value=None): text = value if value is not None else self._lineedit.text() @@ -532,6 +541,8 @@ class DownloadFilenamePrompt(FilenamePrompt): class AuthenticationPrompt(_BasePrompt): + """A prompt for username/password.""" + def __init__(self, question, win_id, parent=None): super().__init__(question, win_id, parent) self._init_title(question) @@ -564,8 +575,8 @@ class AuthenticationPrompt(_BasePrompt): self.question.answer = AuthTuple(username, password) return True elif self._user_lineedit.hasFocus(): - # Earlier, tab was bound to :prompt-accept, so to still support that - # we simply switch the focus when tab was pressed. + # Earlier, tab was bound to :prompt-accept, so to still support + # that we simply switch the focus when tab was pressed. self._password_lineedit.setFocus() self._init_key_label() return False @@ -585,6 +596,8 @@ class AuthenticationPrompt(_BasePrompt): class YesNoPrompt(_BasePrompt): + """A prompt with yes/no answers.""" + KEY_MODE = usertypes.KeyMode.yesno def __init__(self, question, win_id, parent=None): @@ -616,6 +629,8 @@ class YesNoPrompt(_BasePrompt): class AlertPrompt(_BasePrompt): + """A prompt without any answer possibility.""" + def __init__(self, question, win_id, parent=None): super().__init__(question, win_id, parent) self._init_title(question) diff --git a/qutebrowser/utils/message.py b/qutebrowser/utils/message.py index 34b5d7a67..287c8fb40 100644 --- a/qutebrowser/utils/message.py +++ b/qutebrowser/utils/message.py @@ -104,7 +104,7 @@ def ask(win_id, *args, **kwargs): Return: The answer the user gave or None if the prompt was cancelled. """ - question = _build_question(*args, **kwargs) + question = _build_question(*args, **kwargs) # pylint: disable=missing-kwoa bridge = objreg.get('message-bridge', scope='window', window=win_id) bridge.ask(question, blocking=True) answer = question.answer @@ -148,7 +148,7 @@ def confirm_async(win_id, yes_action, no_action=None, cancel_action=None, The question object. """ kwargs['mode'] = usertypes.PromptMode.yesno - question = _build_question(*args, **kwargs) + question = _build_question(*args, **kwargs) # pylint: disable=missing-kwoa question.answered_yes.connect(yes_action) if no_action is not None: question.answered_no.connect(no_action)