Use qtutils.ensure_valid instead of testing isValid in get_by_qurl

This commit is contained in:
Marshall Lochbaum 2016-07-23 11:07:01 -04:00
parent cba25d2bbb
commit 02731743c0

View File

@ -32,7 +32,8 @@ import collections
from PyQt5.QtCore import pyqtSignal, QUrl, QObject from PyQt5.QtCore import pyqtSignal, QUrl, QObject
from qutebrowser.utils import message, usertypes, urlutils, standarddir, objreg from qutebrowser.utils import (message, usertypes, qtutils, urlutils,
standarddir, objreg)
from qutebrowser.commands import cmdexc, cmdutils from qutebrowser.commands import cmdexc, cmdutils
from qutebrowser.misc import lineparser from qutebrowser.misc import lineparser
@ -210,8 +211,7 @@ class QuickmarkManager(UrlMarkManager):
Takes O(n) time, where n is the number of quickmarks. Takes O(n) time, where n is the number of quickmarks.
Use a name instead where possible. Use a name instead where possible.
""" """
if not url.isValid(): qtutils.ensure_valid(url)
raise ValueError("Invalid URL: {}".format(url.errorString()))
urlstr = url.toString(QUrl.RemovePassword | QUrl.FullyEncoded) urlstr = url.toString(QUrl.RemovePassword | QUrl.FullyEncoded)
try: try: