From ddb6743b262b139801405395a1f1a7a1117d1347 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Wed, 20 May 2015 13:33:50 +0200 Subject: [PATCH] urlutils: Clean up qurl_from_user_input in is_url. --- qutebrowser/utils/urlutils.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/qutebrowser/utils/urlutils.py b/qutebrowser/utils/urlutils.py index 5428ba921..a7c0b0320 100644 --- a/qutebrowser/utils/urlutils.py +++ b/qutebrowser/utils/urlutils.py @@ -236,6 +236,7 @@ def is_url(urlstr): urlstr = urlstr.strip() qurl = QUrl(urlstr) + qurl_userinput = qurl_from_user_input(urlstr) if not autosearch: # no autosearch, so everything is a URL unless it has an explicit @@ -246,6 +247,9 @@ def is_url(urlstr): else: return False + if not qurl_userinput.isValid(): + return False + if _has_explicit_scheme(qurl): # URLs with explicit schemes are always URLs log.url.debug("Contains explicit scheme") @@ -269,7 +273,7 @@ def is_url(urlstr): else: raise ValueError("Invalid autosearch value") log.url.debug("url = {}".format(url)) - return url and qurl_from_user_input(urlstr).isValid() + return url and qurl_userinput.isValid() def qurl_from_user_input(urlstr):