From 16218a990006652b7b9aec3c3f29b67b16d97c8a Mon Sep 17 00:00:00 2001 From: gammelon Date: Tue, 20 Feb 2018 18:11:50 +0100 Subject: [PATCH] Remove unnecessary try, rephrase to imperative mood --- qutebrowser/config/configdata.yml | 3 +-- qutebrowser/utils/urlutils.py | 10 ++++------ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/qutebrowser/config/configdata.yml b/qutebrowser/config/configdata.yml index 23ff271f0..2cb36abcc 100644 --- a/qutebrowser/config/configdata.yml +++ b/qutebrowser/config/configdata.yml @@ -1448,8 +1448,7 @@ url.incdec_segments: url.open_base_url: type: Bool default: false - desc: Invoking `:open {shortcut}` (without argument), where {shortcut} is a search engine shortcut - will open the base url of the shortcut instead of using the default search engine. + desc: Open base URL of the searchengine if a searchengine shortcut is invoked without parameters. url.searchengines: default: diff --git a/qutebrowser/utils/urlutils.py b/qutebrowser/utils/urlutils.py index 1bb062f3f..5f502e6fd 100644 --- a/qutebrowser/utils/urlutils.py +++ b/qutebrowser/utils/urlutils.py @@ -103,12 +103,10 @@ def _get_search_url(txt): template = config.val.url.searchengines[engine] url = qurl_from_user_input(template.format(urllib.parse.quote(term))) - if config.val.url.open_base_url: - try: - search_url = urllib.parse.urlparse(config.val.url.searchengines[term]) - url = QUrl('{}://{}'.format(search_url.scheme, search_url.netloc)) - except KeyError: - pass + if config.val.url.open_base_url and \ + term in config.val.url.searchengines.keys(): + search_url = urllib.parse.urlparse(config.val.url.searchengines[term]) + url = QUrl('{}://{}'.format(search_url.scheme, search_url.netloc)) qtutils.ensure_valid(url) return url