From f0990aec32a8542a943b94ae1d5f90dc62f59bc7 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 7 Oct 2014 07:04:49 +0200
Subject: [PATCH] Fix loading of quickmarks with fuzzy URLs

---
 qutebrowser/browser/commands.py   | 3 +--
 qutebrowser/browser/quickmarks.py | 5 +++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 6f1d70286..4e28c3515 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -770,8 +770,7 @@ class CommandDispatcher:
             bg: Load the quickmark in a new background tab.
             window: Load the quickmark in a new window.
         """
-        urlstr = quickmarks.get(name)
-        url = QUrl(urlstr)
+        url = quickmarks.get(name)
         self._open(url, tab, bg, window)
 
     @cmdutils.register(instance='command-dispatcher', name='inspector',
diff --git a/qutebrowser/browser/quickmarks.py b/qutebrowser/browser/quickmarks.py
index b270fb8a9..835935eb3 100644
--- a/qutebrowser/browser/quickmarks.py
+++ b/qutebrowser/browser/quickmarks.py
@@ -108,8 +108,9 @@ def get(name):
         raise cmdexc.CommandError(
             "Quickmark '{}' does not exist!".format(name))
     urlstr = marks[name]
-    url = QUrl(urlstr)
-    if not url.isValid():
+    try:
+        url = urlutils.fuzzy_url(urlstr)
+    except urlutils.FuzzyUrlError:
         raise cmdexc.CommandError(
             "Invalid URL for quickmark {}: {} ({})".format(name, urlstr,
                                                            url.errorString()))