diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index 932ccd80e..931183a13 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -96,6 +96,15 @@ Deprecated - `:download ` is now deprecated and `:download --dest ` should be used instead. +Removed +~~~~~~~ + +- `:scroll` with two pixel-arguments (deprecated in v0.3.0) +- The `:run-userscript` command (deprecated in v0.2.0) +- The `rapid` and `rapid-win` targets for `:hint` (deprecated in v0.2.0) +- The `:cancel-download` command (deprecated in v0.2.0) +- The `:download-page` command (deprecated in v0.2.0) + Fixed ~~~~~ diff --git a/doc/help/commands.asciidoc b/doc/help/commands.asciidoc index abcb15194..68f6a98a9 100644 --- a/doc/help/commands.asciidoc +++ b/doc/help/commands.asciidoc @@ -1136,7 +1136,7 @@ This acts like readline's yank. [[scroll]] === scroll -Syntax: +:scroll 'direction' ['dy']+ +Syntax: +:scroll 'direction'+ Scroll the current tab in the given direction. diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py index 800be4030..fa5c3c2d2 100644 --- a/qutebrowser/browser/commands.py +++ b/qutebrowser/browser/commands.py @@ -508,32 +508,14 @@ class CommandDispatcher: @cmdutils.register(instance='command-dispatcher', hide=True, scope='window', count='count') - def scroll(self, - direction: {'type': (str, int)}, - dy: {'type': int, 'hide': True}=None, - count=1): + def scroll(self, direction: {'type': (str, int)}, count=1): """Scroll the current tab in the given direction. Args: direction: In which direction to scroll (up/down/left/right/top/bottom). - dy: Deprecated argument to support the old dx/dy form. count: multiplier """ - # pylint: disable=too-many-locals - try: - # Check for deprecated dx/dy form (like with scroll-px). - dx = int(direction) - dy = int(dy) - except (ValueError, TypeError): - # Invalid values will get handled later. - pass - else: - message.warning(self._win_id, ":scroll with dx/dy arguments is " - "deprecated - use :scroll-px instead!") - self.scroll_px(dx, dy, count=count) - return - fake_keys = { 'up': Qt.Key_Up, 'down': Qt.Key_Down, @@ -953,7 +935,7 @@ class CommandDispatcher: cmd, args, userscript)) if userscript: # ~ expansion is handled by the userscript module. - self.run_userscript(cmd, *args, verbose=verbose) + self._run_userscript(cmd, *args, verbose=verbose) else: cmd = os.path.expanduser(cmd) proc = guiprocess.GUIProcess(self._win_id, what='command', @@ -969,9 +951,7 @@ class CommandDispatcher: """Open main startpage in current tab.""" self.openurl(config.get('general', 'startpage')[0]) - @cmdutils.register(instance='command-dispatcher', scope='window', - deprecated='Use :spawn --userscript instead!') - def run_userscript(self, cmd, *args: {'nargs': '*'}, verbose=False): + def _run_userscript(self, cmd, *args, verbose=False): """Run a userscript given as argument. Args: @@ -1184,12 +1164,6 @@ class CommandDispatcher: else: mhtml.start_download_checked(dest, web_view=web_view) - @cmdutils.register(instance='command-dispatcher', scope='window', - deprecated="Use :download instead.") - def download_page(self): - """Download the current page.""" - self.download() - @cmdutils.register(instance='command-dispatcher', scope='window') def view_source(self): """Show the source of the current page.""" diff --git a/qutebrowser/browser/downloads.py b/qutebrowser/browser/downloads.py index 7a321eae7..582d7b092 100644 --- a/qutebrowser/browser/downloads.py +++ b/qutebrowser/browser/downloads.py @@ -947,17 +947,6 @@ class DownloadManager(QAbstractListModel): download.delete() self.remove_item(download) - @cmdutils.register(instance='download-manager', scope='window', - deprecated="Use :download-cancel instead.", - count='count') - def cancel_download(self, count=1): - """Cancel the first/[count]th download. - - Args: - count: The index of the download to cancel. - """ - self.download_cancel(count) - @cmdutils.register(instance='download-manager', scope='window', count='count') def download_open(self, count=0): diff --git a/qutebrowser/browser/hints.py b/qutebrowser/browser/hints.py index b646deae7..071493419 100644 --- a/qutebrowser/browser/hints.py +++ b/qutebrowser/browser/hints.py @@ -43,8 +43,8 @@ ElemTuple = collections.namedtuple('ElemTuple', ['elem', 'label']) Target = usertypes.enum('Target', ['normal', 'tab', 'tab_fg', 'tab_bg', 'window', 'yank', 'yank_primary', 'run', - 'fill', 'hover', 'rapid', 'rapid_win', - 'download', 'userscript', 'spawn']) + 'fill', 'hover', 'download', 'userscript', + 'spawn']) @pyqtSlot(usertypes.KeyMode) @@ -69,7 +69,6 @@ class HintContext: yank/yank_primary: Yank to clipboard/primary selection. run: Run a command. fill: Fill commandline with link. - rapid: Rapid mode with background tabs download: Download the link. userscript: Call a custom userscript. spawn: Spawn a simple command. @@ -415,8 +414,6 @@ class HintManager(QObject): context: The HintContext to use. """ target_mapping = { - Target.rapid: usertypes.ClickTarget.tab_bg, - Target.rapid_win: usertypes.ClickTarget.window, Target.normal: usertypes.ClickTarget.normal, Target.tab_fg: usertypes.ClickTarget.tab, Target.tab_bg: usertypes.ClickTarget.tab_bg, @@ -437,7 +434,7 @@ class HintManager(QObject): action, elem, pos.x(), pos.y())) self.start_hinting.emit(target_mapping[context.target]) if context.target in [Target.tab, Target.tab_fg, Target.tab_bg, - Target.window, Target.rapid, Target.rapid_win]: + Target.window]: modifiers = Qt.ControlModifier else: modifiers = Qt.NoModifier @@ -802,7 +799,6 @@ class HintManager(QObject): self._context.args = args self._context.mainframe = mainframe self._context.group = group - self._handle_old_rapid_targets(win_id) self._init_elements() message_bridge = objreg.get('message-bridge', scope='window', window=self._win_id) @@ -811,29 +807,6 @@ class HintManager(QObject): modeman.enter(self._win_id, usertypes.KeyMode.hint, 'HintManager.start') - def _handle_old_rapid_targets(self, win_id): - """Switch to the new way for rapid hinting with a rapid target. - - Args: - win_id: The window ID to display the warning in. - - DEPRECATED. - """ - old_rapid_targets = { - Target.rapid: Target.tab_bg, - Target.rapid_win: Target.window, - } - target = self._context.target - if target in old_rapid_targets: - self._context.target = old_rapid_targets[target] - self._context.rapid = True - name = target.name.replace('_', '-') - group_name = self._context.group.name.replace('_', '-') - new_name = self._context.target.name.replace('_', '-') - message.warning( - win_id, ':hint with target {} is deprecated, use :hint ' - '--rapid {} {} instead!'.format(name, group_name, new_name)) - def handle_partial_key(self, keystr): """Handle a new partial keypress.""" log.hints.debug("Handling new keystring: '{}'".format(keystr)) diff --git a/tests/integration/features/scroll.feature b/tests/integration/features/scroll.feature index 1495be26c..0022ce96b 100644 --- a/tests/integration/features/scroll.feature +++ b/tests/integration/features/scroll.feature @@ -95,16 +95,6 @@ Feature: Scrolling Then the error "Invalid value 'foobar' for direction - expected one of: bottom, down, left, page-down, page-up, right, top, up" should be shown And the page should not be scrolled - Scenario: :scroll with deprecated pixel argument - When I run :scroll 0 10 - Then the warning ":scroll with dx/dy arguments is deprecated - use :scroll-px instead!" should be shown - Then the page should be scrolled vertically - - Scenario: :scroll with deprecated pixel argument (float) - When I run :scroll 2.5 2.5 - Then the error "scroll: Argument dy: invalid int value: '2.5'" should be shown - And the page should not be scrolled - Scenario: Scrolling down and up with count When I run :scroll down with count 2 And I run :scroll up