From 4eda328a61713d4a6d9c52fa5c3e272596669c2e Mon Sep 17 00:00:00 2001 From: Artur Shaikhullin Date: Thu, 30 Nov 2017 20:38:38 +0600 Subject: [PATCH] Fix some lint warnings. Enable caret tests --- qutebrowser/browser/browsertab.py | 2 +- qutebrowser/browser/commands.py | 21 +++++----- qutebrowser/browser/webengine/webenginetab.py | 41 ++++++++++--------- qutebrowser/javascript/webengine_caret.js | 3 +- tests/end2end/features/test_caret_bdd.py | 5 --- 5 files changed, 34 insertions(+), 38 deletions(-) diff --git a/qutebrowser/browser/browsertab.py b/qutebrowser/browser/browsertab.py index 827d11761..1498097b1 100644 --- a/qutebrowser/browser/browsertab.py +++ b/qutebrowser/browser/browsertab.py @@ -392,7 +392,7 @@ class AbstractCaret(QObject): def has_selection(self): raise NotImplementedError - def selection(self, html=False, selection=None): + def selection(self, html=False, callback=None): raise NotImplementedError def follow_selected(self, *, tab=False): diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py index 5a0108b1b..476bf1693 100644 --- a/qutebrowser/browser/commands.py +++ b/qutebrowser/browser/commands.py @@ -839,9 +839,9 @@ class CommandDispatcher: keep: Stay in visual mode after yanking the selection. """ self.yank_object = { - 'sel': sel, - 'what': what, - 'keep': keep + 'sel': sel, + 'what': what, + 'keep': keep } if what == 'title': s = self._tabbed_browser.page_title(self._current_index()) @@ -877,7 +877,8 @@ class CommandDispatcher: utils.set_clipboard(s, selection=self.yank_object['sel']) if self.yank_object['what'] != 'selection': - message.info("Yanked {} to {}: {}".format(self.yank_object['what'], target, s)) + message.info("Yanked {} to {}: {}".format( + self.yank_object['what'], target, s)) else: message.info("{} {} yanked to {}".format( len(s), "char" if len(s) == 1 else "chars", target)) @@ -1222,9 +1223,9 @@ class CommandDispatcher: # until it fixed or blocked async call implemented: # https://github.com/qutebrowser/qutebrowser/issues/3327 self.userscript_object = { - 'cmd': cmd, - 'args': args, - 'verbose': verbose + 'cmd': cmd, + 'args': args, + 'verbose': verbose } caret = self._current_widget().caret caret.selection(False, self._selection_callback) @@ -1279,9 +1280,9 @@ class CommandDispatcher: env['QUTE_URL'] = url.toString(QUrl.FullyEncoded) try: - userscripts.run_async(tab, self.userscript_object['cmd'], - *self.userscript_object['args'], win_id=self._win_id, - env=env, verbose=self.userscript_object['verbose']) + userscripts.run_async(tab, self.userscript_object['cmd'], + *self.userscript_object['args'], win_id=self._win_id, + env=env, verbose=self.userscript_object['verbose']) except userscripts.Error as e: raise cmdexc.CommandError(e) finally: diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py index 243a711e0..8f71d5b1c 100644 --- a/qutebrowser/browser/webengine/webenginetab.py +++ b/qutebrowser/browser/webengine/webenginetab.py @@ -180,91 +180,91 @@ class WebEngineCaret(browsertab.AbstractCaret): @pyqtSlot(usertypes.KeyMode) def _on_mode_entered(self, mode): self._tab.run_js_async( - javascript.assemble('caret', 'setInitialCursor')) + javascript.assemble('caret', 'setInitialCursor')) @pyqtSlot(usertypes.KeyMode) def _on_mode_left(self): self._tab.run_js_async( - javascript.assemble('caret', 'toggle')) + javascript.assemble('caret', 'toggle')) def move_to_next_line(self, count=1): for _ in range(count): self._tab.run_js_async( - javascript.assemble('caret', 'moveDown')) + javascript.assemble('caret', 'moveDown')) def move_to_prev_line(self, count=1): for _ in range(count): self._tab.run_js_async( - javascript.assemble('caret', 'moveUp')) + javascript.assemble('caret', 'moveUp')) def move_to_next_char(self, count=1): for _ in range(count): self._tab.run_js_async( - javascript.assemble('caret', 'moveRight')) + javascript.assemble('caret', 'moveRight')) def move_to_prev_char(self, count=1): for _ in range(count): self._tab.run_js_async( - javascript.assemble('caret', 'moveLeft')) + javascript.assemble('caret', 'moveLeft')) def move_to_end_of_word(self, count=1): for _ in range(count): self._tab.run_js_async( - javascript.assemble('caret', 'moveToEndOfWord')) + javascript.assemble('caret', 'moveToEndOfWord')) def move_to_next_word(self, count=1): for _ in range(count): self._tab.run_js_async( - javascript.assemble('caret', 'moveToNextWord')) + javascript.assemble('caret', 'moveToNextWord')) def move_to_prev_word(self, count=1): for _ in range(count): self._tab.run_js_async( - javascript.assemble('caret', 'moveToPreviousWord')) + javascript.assemble('caret', 'moveToPreviousWord')) def move_to_start_of_line(self): self._tab.run_js_async( - javascript.assemble('caret', 'moveToStartOfLine')) + javascript.assemble('caret', 'moveToStartOfLine')) def move_to_end_of_line(self): self._tab.run_js_async( - javascript.assemble('caret', 'moveToEndOfLine')) + javascript.assemble('caret', 'moveToEndOfLine')) def move_to_start_of_next_block(self, count=1): for _ in range(count): self._tab.run_js_async( - javascript.assemble('caret', 'moveToStartOfNextBlock')) + javascript.assemble('caret', 'moveToStartOfNextBlock')) def move_to_start_of_prev_block(self, count=1): for _ in range(count): self._tab.run_js_async( - javascript.assemble('caret', 'moveToStartOfPrevBlock')) + javascript.assemble('caret', 'moveToStartOfPrevBlock')) def move_to_end_of_next_block(self, count=1): for _ in range(count): self._tab.run_js_async( - javascript.assemble('caret', 'moveToEndOfNextBlock')) + javascript.assemble('caret', 'moveToEndOfNextBlock')) def move_to_end_of_prev_block(self, count=1): for _ in range(count): self._tab.run_js_async( - javascript.assemble('caret', 'moveToEndOfPrevBlock')) + javascript.assemble('caret', 'moveToEndOfPrevBlock')) def move_to_start_of_document(self): self._tab.run_js_async( - javascript.assemble('caret', 'moveToStartOfDocument')) + javascript.assemble('caret', 'moveToStartOfDocument')) def move_to_end_of_document(self): self._tab.run_js_async( - javascript.assemble('caret', 'moveToEndOfDocument')) + javascript.assemble('caret', 'moveToEndOfDocument')) def toggle_selection(self): self._tab.run_js_async( - javascript.assemble('caret', 'toggleSelection')) + javascript.assemble('caret', 'toggleSelection')) def drop_selection(self): self._tab.run_js_async( - javascript.assemble('caret', 'dropSelection')) + javascript.assemble('caret', 'dropSelection')) def has_selection(self): if qtutils.version_check('5.10'): @@ -283,7 +283,7 @@ class WebEngineCaret(browsertab.AbstractCaret): # WORKAROUND for # https://bugreports.qt.io/browse/QTBUG-53134 self._tab.run_js_async( - 'window.getSelection().toString()', callback) + 'window.getSelection().toString()', callback) self.drop_selection() def _follow_selected_cb(self, js_elem, tab=False): @@ -328,6 +328,7 @@ class WebEngineCaret(browsertab.AbstractCaret): self._tab.run_js_async(js_code, lambda jsret: self._follow_selected_cb(jsret, tab)) + class WebEngineScroller(browsertab.AbstractScroller): """QtWebEngine implementations related to scrolling.""" diff --git a/qutebrowser/javascript/webengine_caret.js b/qutebrowser/javascript/webengine_caret.js index 4510b13f3..8390174a5 100644 --- a/qutebrowser/javascript/webengine_caret.js +++ b/qutebrowser/javascript/webengine_caret.js @@ -1,8 +1,7 @@ "use strict"; window._qutebrowser.caret = (function() { - - var axs = {}; + const axs = {}; axs.dom = {}; diff --git a/tests/end2end/features/test_caret_bdd.py b/tests/end2end/features/test_caret_bdd.py index 9e4e1dedd..97b18434b 100644 --- a/tests/end2end/features/test_caret_bdd.py +++ b/tests/end2end/features/test_caret_bdd.py @@ -23,9 +23,4 @@ import pytest_bdd as bdd # pylint: disable=unused-import from end2end.features.test_yankpaste_bdd import init_fake_clipboard - -pytestmark = pytest.mark.qtwebengine_todo("Caret mode is not implemented", - run=False) - - bdd.scenarios('caret.feature')