From 66719c5ecc88eb3433c1551d34f1b1ef281a24c4 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Fri, 3 Feb 2017 23:55:14 +0100 Subject: [PATCH] Fix lint --- qutebrowser/browser/mouse.py | 3 ++- qutebrowser/browser/webelem.py | 2 +- qutebrowser/browser/webengine/webengineelem.py | 7 ++++++- qutebrowser/browser/webengine/webenginetab.py | 2 +- tests/end2end/fixtures/quteprocess.py | 3 ++- 5 files changed, 12 insertions(+), 5 deletions(-) diff --git a/qutebrowser/browser/mouse.py b/qutebrowser/browser/mouse.py index 23ddce6ee..c284f3eab 100644 --- a/qutebrowser/browser/mouse.py +++ b/qutebrowser/browser/mouse.py @@ -208,6 +208,7 @@ class MouseEventFilter(QObject): if evtype not in self._handlers: return False if obj is not self._tab.event_target(): - log.mouse.debug("Ignoring {} to {}".format(event.__class__.__name__, obj)) + log.mouse.debug("Ignoring {} to {}".format(event.__class__.__name__, + obj)) return False return self._handlers[evtype](event) diff --git a/qutebrowser/browser/webelem.py b/qutebrowser/browser/webelem.py index 560674e98..dfcd69ef7 100644 --- a/qutebrowser/browser/webelem.py +++ b/qutebrowser/browser/webelem.py @@ -393,7 +393,7 @@ class AbstractWebElement(collections.abc.MutableMapping): """Simulate a click on the element. Args: - click_target: An usertypes.ClickTarget member, what kind of click + click_target: A usertypes.ClickTarget member, what kind of click to simulate. force_event: Force generating a fake mouse event. """ diff --git a/qutebrowser/browser/webengine/webengineelem.py b/qutebrowser/browser/webengine/webengineelem.py index fe42d355d..8e493bf9b 100644 --- a/qutebrowser/browser/webengine/webengineelem.py +++ b/qutebrowser/browser/webengine/webengineelem.py @@ -25,7 +25,7 @@ from PyQt5.QtCore import QRect, Qt, QPoint from PyQt5.QtGui import QMouseEvent -from qutebrowser.utils import log, javascript, usertypes +from qutebrowser.utils import log, javascript from qutebrowser.browser import webelem @@ -153,9 +153,14 @@ class WebEngineElement(webelem.AbstractWebElement): def _click_editable(self): # WORKAROUND for https://bugreports.qt.io/browse/QTBUG-58515 + # pylint doesn't know about Qt.MouseEventSynthesizedBySystem + # because it was added in Qt 5.6, but we can be sure we use that with + # QtWebEngine. + # pylint: disable=no-member ev = QMouseEvent(QMouseEvent.MouseButtonPress, QPoint(0, 0), QPoint(0, 0), QPoint(0, 0), Qt.NoButton, Qt.NoButton, Qt.NoModifier, Qt.MouseEventSynthesizedBySystem) + # pylint: enable=no-member self._tab.send_event(ev) # This actually "clicks" the element by calling focus() on it in JS. js_code = javascript.assemble('webelem', 'focus', self._id) diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py index a555a2d15..6c654a6ee 100644 --- a/qutebrowser/browser/webengine/webenginetab.py +++ b/qutebrowser/browser/webengine/webenginetab.py @@ -27,7 +27,7 @@ import functools from PyQt5.QtCore import pyqtSlot, Qt, QEvent, QPoint, QUrl, QTimer from PyQt5.QtGui import QKeyEvent, QIcon # pylint: disable=no-name-in-module,import-error,useless-suppression -from PyQt5.QtWidgets import QOpenGLWidget, QApplication +from PyQt5.QtWidgets import QApplication from PyQt5.QtWebEngineWidgets import (QWebEnginePage, QWebEngineScript, QWebEngineProfile) # pylint: enable=no-name-in-module,import-error,useless-suppression diff --git a/tests/end2end/fixtures/quteprocess.py b/tests/end2end/fixtures/quteprocess.py index 831e210ce..4fe3ff12b 100644 --- a/tests/end2end/fixtures/quteprocess.py +++ b/tests/end2end/fixtures/quteprocess.py @@ -218,7 +218,8 @@ class QuteProc(testprocess.Process): log_line.waited_for = True self._is_ready('load') elif log_line.category == 'misc' and any(testutils.pattern_match( - pattern=pattern, value=log_line.message) for pattern in start_okay_messages_focus): + pattern=pattern, value=log_line.message) for pattern in + start_okay_messages_focus): self._is_ready('focus') elif (log_line.category == 'init' and log_line.module == 'standarddir' and