From f3fd2472828bd8dd5d78748b1b4e8b37f28a0cb9 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Thu, 22 May 2014 16:40:54 +0200 Subject: [PATCH] Make LineConfigParser iterable. --- qutebrowser/browser/cookies.py | 2 +- qutebrowser/config/lineparser.py | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/qutebrowser/browser/cookies.py b/qutebrowser/browser/cookies.py index 5f6eb70fa..b73872acd 100644 --- a/qutebrowser/browser/cookies.py +++ b/qutebrowser/browser/cookies.py @@ -34,7 +34,7 @@ class CookieJar(QNetworkCookieJar): datadir = get_standard_dir(QStandardPaths.DataLocation) self._linecp = LineConfigParser(datadir, 'cookies') cookies = [] - for line in self._linecp.data: + for line in self._linecp: cookies += QNetworkCookie.parseCookies(line.encode('utf-8')) self.setAllCookies(cookies) diff --git a/qutebrowser/config/lineparser.py b/qutebrowser/config/lineparser.py index 3675d171c..61960cacd 100644 --- a/qutebrowser/config/lineparser.py +++ b/qutebrowser/config/lineparser.py @@ -51,6 +51,10 @@ class LineConfigParser: logging.debug("Reading config from {}".format(self._configfile)) self.read(self._configfile) + def __iter__(self): + """Iterate over the set data.""" + return self.data.__iter__() + def read(self, filename): """Read the data from a file.""" with open(filename, 'r', encoding='utf-8') as f: