From 736f559afaf016a710c5920282e14b28378887bd Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Fri, 20 Jun 2014 22:57:32 +0200 Subject: [PATCH] Fix URL handling for quickmarks. --- qutebrowser/browser/commands.py | 4 ++-- qutebrowser/browser/quickmarks.py | 12 +++++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py index 9044517b1..e8c3d08b9 100644 --- a/qutebrowser/browser/commands.py +++ b/qutebrowser/browser/commands.py @@ -639,8 +639,8 @@ class CommandDispatcher: @cmdutils.register(instance='mainwindow.tabs.cmd') def quickmark_load(self, name): """Load a quickmark.""" - url = quickmarks.get(name) - self._tabs.currentWidget().openurl(url) + urlstr = quickmarks.get(name) + self._tabs.currentWidget().openurl(QUrl(urlstr)) @cmdutils.register(instance='mainwindow.tabs.cmd') def quickmark_load_tab(self, name): diff --git a/qutebrowser/browser/quickmarks.py b/qutebrowser/browser/quickmarks.py index 39d4d8283..3399da9d2 100644 --- a/qutebrowser/browser/quickmarks.py +++ b/qutebrowser/browser/quickmarks.py @@ -17,7 +17,12 @@ # You should have received a copy of the GNU General Public License # along with qutebrowser. If not, see . -"""Manager for quickmarks.""" +"""Manager for quickmarks. + +Note we violate our general QUrl rule by storing url strings in the marks +OrderedDict. This is because we read them from a file at start and write them +to a file on shutdown, so it makes semse to keep them as strings her.e +""" from functools import partial from collections import OrderedDict @@ -88,7 +93,8 @@ def quickmark_add(url, name): def get(name): - """Get the URL of the quickmark named name.""" + """Get the URL of the quickmark named name as a QUrl.""" if name not in marks: raise CommandError("Quickmark '{}' does not exist!".format(name)) - return marks[name] + urlstr = marks[name] + return QUrl(urlstr)