From 736fd7d45e70cb337c4c11155528e4d9c93c5765 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Sun, 29 Nov 2015 00:59:18 +0100 Subject: [PATCH] Use os.path.join for bookmarks/urls path. This should fix the tests on Windows which failed because they matched against a message containing \. --- qutebrowser/browser/urlmarks.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/qutebrowser/browser/urlmarks.py b/qutebrowser/browser/urlmarks.py index cacc8d9c0..871c9954e 100644 --- a/qutebrowser/browser/urlmarks.py +++ b/qutebrowser/browser/urlmarks.py @@ -247,11 +247,13 @@ class BookmarkManager(UrlMarkManager): bookmarks_directory = os.path.join(standarddir.config(), 'bookmarks') if not os.path.isdir(bookmarks_directory): os.makedirs(bookmarks_directory) + + bookmarks_subdir = os.path.join('bookmarks', 'urls') self._lineparser = lineparser.LineParser( - standarddir.config(), 'bookmarks/urls', parent=self) + standarddir.config(), bookmarks_subdir, parent=self) def _init_savemanager(self, save_manager): - filename = os.path.join(standarddir.config(), 'bookmarks/urls') + filename = os.path.join(standarddir.config(), 'bookmarks', 'urls') save_manager.add_saveable('bookmark-manager', self.save, self.changed, filename=filename)