From 36e52721dac3958470ee4811b76a6bbc72bd1511 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Mon, 5 May 2014 17:56:35 +0200 Subject: [PATCH] Fix CRLFs in cookies.py --- qutebrowser/browser/cookies.py | 120 ++++++++++++++++----------------- 1 file changed, 60 insertions(+), 60 deletions(-) diff --git a/qutebrowser/browser/cookies.py b/qutebrowser/browser/cookies.py index 82d177268..52fafc937 100644 --- a/qutebrowser/browser/cookies.py +++ b/qutebrowser/browser/cookies.py @@ -1,60 +1,60 @@ -# Copyright 2014 Florian Bruhin (The Compiler) -# -# This file is part of qutebrowser. -# -# qutebrowser is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# qutebrowser is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with qutebrowser. If not, see . - -"""Handling of HTTP cookies.""" - -import qutebrowser.config.config as config -from qutebrowser.config.lineparser import LineConfigParser - -from PyQt5.QtNetwork import QNetworkCookie, QNetworkCookieJar - - -class CookieJar(QNetworkCookieJar): - - """Our own cookie jar to save cookies to disk if desired.""" - - def __init__(self, datadir): - super().__init__() - self._linecp = LineConfigParser(datadir, 'cookies') - cookies = [] - for line in self._linecp.data: - cookies += QNetworkCookie.parseCookies(line.encode('utf-8')) - self.setAllCookies(cookies) - - def setCookiesFromUrl(self, cookies, url): - """Add the cookies in the cookies list to this cookie jar. - - Args: - cookies: A list of QNetworkCookies. - url: The URL to set the cookies for. - - Return: - True if one or more cookies are set for url, otherwise False. - """ - if config.get('network', 'accept-cookies') == 'never': - return False - else: - return super().setCookiesFromUrl(cookies, url) - - def save(self): - """Save cookies to disk.""" - lines = [] - for cookie in self.allCookies(): - if not cookie.isSessionCookie(): - lines.append(bytes(cookie.toRawForm()).decode('utf-8')) - self._linecp.data = lines - self._linecp.save() +# Copyright 2014 Florian Bruhin (The Compiler) +# +# This file is part of qutebrowser. +# +# qutebrowser is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# qutebrowser is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with qutebrowser. If not, see . + +"""Handling of HTTP cookies.""" + +import qutebrowser.config.config as config +from qutebrowser.config.lineparser import LineConfigParser + +from PyQt5.QtNetwork import QNetworkCookie, QNetworkCookieJar + + +class CookieJar(QNetworkCookieJar): + + """Our own cookie jar to save cookies to disk if desired.""" + + def __init__(self, datadir): + super().__init__() + self._linecp = LineConfigParser(datadir, 'cookies') + cookies = [] + for line in self._linecp.data: + cookies += QNetworkCookie.parseCookies(line.encode('utf-8')) + self.setAllCookies(cookies) + + def setCookiesFromUrl(self, cookies, url): + """Add the cookies in the cookies list to this cookie jar. + + Args: + cookies: A list of QNetworkCookies. + url: The URL to set the cookies for. + + Return: + True if one or more cookies are set for url, otherwise False. + """ + if config.get('network', 'accept-cookies') == 'never': + return False + else: + return super().setCookiesFromUrl(cookies, url) + + def save(self): + """Save cookies to disk.""" + lines = [] + for cookie in self.allCookies(): + if not cookie.isSessionCookie(): + lines.append(bytes(cookie.toRawForm()).decode('utf-8')) + self._linecp.data = lines + self._linecp.save()