From 5f0cb139515a3f8974e2490cbb3d0b86ec80036d Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Mon, 5 Dec 2022 18:05:48 +0100 Subject: browser.command: Fix some type annotations --- qutebrowser/browser/commands.py | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py index 7929ae005..525344ea7 100644 --- a/qutebrowser/browser/commands.py +++ b/qutebrowser/browser/commands.py @@ -109,8 +109,15 @@ class CommandDispatcher: raise cmdutils.CommandError("No WebView available yet!") return widget - def _open(self, url, tab=False, background=False, window=False, - related=False, private=None): + def _open( + self, + url: QUrl, + tab: bool = False, + background: bool = False, + window: bool = False, + related: bool = False, + private: Optional[bool] = None, + ): """Helper function to open a page. Args: @@ -123,11 +130,12 @@ class CommandDispatcher: """ urlutils.raise_cmdexc_if_invalid(url) tabbed_browser = self._tabbed_browser - cmdutils.check_exclusive((tab, background, window, private), 'tbwp') + cmdutils.check_exclusive((tab, background, window, private or False), 'tbwp') if window and private is None: private = self._tabbed_browser.is_private if window or private: + assert isinstance(private, bool) tabbed_browser = self._new_tabbed_browser(private) tabbed_browser.tabopen(url) elif tab: @@ -403,14 +411,14 @@ class CommandDispatcher: except browsertab.WebTabError as e: raise cmdutils.CommandError(e) - # The new tab could be in a new tabbed_browser (e.g. because of - # tabs.tabs_are_windows being set) if window or private: new_tabbed_browser = self._new_tabbed_browser( private=self._tabbed_browser.is_private or private) else: new_tabbed_browser = self._tabbed_browser newtab = new_tabbed_browser.tabopen(background=bg) + # The new tab could be in a new tabbed_browser (e.g. because of + # tabs.tabs_are_windows being set) new_tabbed_browser = objreg.get('tabbed-browser', scope='window', window=newtab.win_id) idx = new_tabbed_browser.widget.indexOf(newtab) -- cgit v1.2.3-54-g00ecf