diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc index bd29784fe..1d30a6d9e 100644 --- a/doc/changelog.asciidoc +++ b/doc/changelog.asciidoc @@ -39,6 +39,12 @@ Deprecated - `:tab-detach` has been deprecated, as `:tab-give` without argument can be used instead. +Removed +~~~~~~~ + +- The long-deprecated `:prompt-yes`, `:prompt-no`, `:paste-primary` and `:paste` + commands have been removed. + v1.0.2 ------ diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py index 2983bbd02..801ff290d 100644 --- a/qutebrowser/browser/commands.py +++ b/qutebrowser/browser/commands.py @@ -1012,43 +1012,6 @@ class CommandDispatcher: else: raise cmdexc.CommandError("Last tab") - @cmdutils.register(instance='command-dispatcher', scope='window', - deprecated="Use :open {clipboard}") - def paste(self, sel=False, tab=False, bg=False, window=False): - """Open a page from the clipboard. - - If the pasted text contains newlines, each line gets opened in its own - tab. - - Args: - sel: Use the primary selection instead of the clipboard. - tab: Open in a new tab. - bg: Open in a background tab. - window: Open in new window. - """ - force_search = False - if not utils.supports_selection(): - sel = False - try: - text = utils.get_clipboard(selection=sel) - except utils.ClipboardError as e: - raise cmdexc.CommandError(e) - text_urls = [u for u in text.split('\n') if u.strip()] - if (len(text_urls) > 1 and not urlutils.is_url(text_urls[0]) and - urlutils.get_path_if_valid( - text_urls[0], check_exists=True) is None): - force_search = True - text_urls = [text] - for i, text_url in enumerate(text_urls): - if not window and i > 0: - tab = False - bg = True - try: - url = urlutils.fuzzy_url(text_url, force_search=force_search) - except urlutils.InvalidUrlError as e: - raise cmdexc.CommandError(e) - self._open(url, tab, bg, window) - def _resolve_buffer_index(self, index): """Resolve a buffer index to the tabbedbrowser and tab. @@ -1676,14 +1639,6 @@ class CommandDispatcher: except webelem.Error as e: raise cmdexc.CommandError(str(e)) - @cmdutils.register(instance='command-dispatcher', - deprecated="Use :insert-text {primary}", - modes=[KeyMode.insert], hide=True, scope='window', - backend=usertypes.Backend.QtWebKit) - def paste_primary(self): - """Paste the primary selection at cursor position.""" - self.insert_text(utils.get_clipboard(selection=True, fallback=True)) - @cmdutils.register(instance='command-dispatcher', maxsplit=0, scope='window') def insert_text(self, text): diff --git a/qutebrowser/mainwindow/prompt.py b/qutebrowser/mainwindow/prompt.py index 1f4c47c78..d00e57174 100644 --- a/qutebrowser/mainwindow/prompt.py +++ b/qutebrowser/mainwindow/prompt.py @@ -388,20 +388,6 @@ class PromptContainer(QWidget): message.global_bridge.prompt_done.emit(self._prompt.KEY_MODE) question.done() - @cmdutils.register(instance='prompt-container', hide=True, scope='window', - modes=[usertypes.KeyMode.yesno], - deprecated='Use :prompt-accept yes instead!') - def prompt_yes(self): - """Answer yes to a yes/no prompt.""" - self.prompt_accept('yes') - - @cmdutils.register(instance='prompt-container', hide=True, scope='window', - modes=[usertypes.KeyMode.yesno], - deprecated='Use :prompt-accept no instead!') - def prompt_no(self): - """Answer no to a yes/no prompt.""" - self.prompt_accept('no') - @cmdutils.register(instance='prompt-container', hide=True, scope='window', modes=[usertypes.KeyMode.prompt], maxsplit=0) def prompt_open_download(self, cmdline: str = None): diff --git a/tests/end2end/features/prompts.feature b/tests/end2end/features/prompts.feature index 7f8ba291d..b11a214b6 100644 --- a/tests/end2end/features/prompts.feature +++ b/tests/end2end/features/prompts.feature @@ -387,22 +387,6 @@ Feature: Prompts Then the javascript message "confirm reply: true" should be logged And the error "No default value was set for this question!" should be shown - Scenario: Javascript confirm with deprecated :prompt-yes command - When I open data/prompt/jsconfirm.html - And I run :click-element id button - And I wait for a prompt - And I run :prompt-yes - Then the javascript message "confirm reply: true" should be logged - And the warning "prompt-yes is deprecated - Use :prompt-accept yes instead!" should be shown - - Scenario: Javascript confirm with deprecated :prompt-no command - When I open data/prompt/jsconfirm.html - And I run :click-element id button - And I wait for a prompt - And I run :prompt-no - Then the javascript message "confirm reply: false" should be logged - And the warning "prompt-no is deprecated - Use :prompt-accept no instead!" should be shown - # Other @qtwebengine_skip