Fix CRLFs in cookies.py

qutebrowser/browser/cookies.py

@@ -1,60 +1,60 @@
-# Copyright 2014 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
-#
+#
-# This file is part of qutebrowser.
+# This file is part of qutebrowser.
-#
+#
-# qutebrowser is free software: you can redistribute it and/or modify
+# qutebrowser is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
+# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# (at your option) any later version.
-#
+#
-# qutebrowser is distributed in the hope that it will be useful,
+# qutebrowser is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License for more details.
-#
+#
-# You should have received a copy of the GNU General Public License
+# You should have received a copy of the GNU General Public License
-# along with qutebrowser.  If not, see <http://www.gnu.org/licenses/>.
+# along with qutebrowser.  If not, see <http://www.gnu.org/licenses/>.
-
+
-"""Handling of HTTP cookies."""
+"""Handling of HTTP cookies."""
-
+
-import qutebrowser.config.config as config
+import qutebrowser.config.config as config
-from qutebrowser.config.lineparser import LineConfigParser
+from qutebrowser.config.lineparser import LineConfigParser
-
+
-from PyQt5.QtNetwork import QNetworkCookie, QNetworkCookieJar
+from PyQt5.QtNetwork import QNetworkCookie, QNetworkCookieJar
-
+
-
+
-class CookieJar(QNetworkCookieJar):
+class CookieJar(QNetworkCookieJar):
-
+
-    """Our own cookie jar to save cookies to disk if desired."""
+    """Our own cookie jar to save cookies to disk if desired."""
-
+
-    def __init__(self, datadir):
+    def __init__(self, datadir):
-        super().__init__()
+        super().__init__()
-        self._linecp = LineConfigParser(datadir, 'cookies')
+        self._linecp = LineConfigParser(datadir, 'cookies')
-        cookies = []
+        cookies = []
-        for line in self._linecp.data:
+        for line in self._linecp.data:
-            cookies += QNetworkCookie.parseCookies(line.encode('utf-8'))
+            cookies += QNetworkCookie.parseCookies(line.encode('utf-8'))
-        self.setAllCookies(cookies)
+        self.setAllCookies(cookies)
-
+
-    def setCookiesFromUrl(self, cookies, url):
+    def setCookiesFromUrl(self, cookies, url):
-        """Add the cookies in the cookies list to this cookie jar.
+        """Add the cookies in the cookies list to this cookie jar.
-
+
-        Args:
+        Args:
-            cookies: A list of QNetworkCookies.
+            cookies: A list of QNetworkCookies.
-            url: The URL to set the cookies for.
+            url: The URL to set the cookies for.
-
+
-        Return:
+        Return:
-            True if one or more cookies are set for url, otherwise False.
+            True if one or more cookies are set for url, otherwise False.
-        """
+        """
-        if config.get('network', 'accept-cookies') == 'never':
+        if config.get('network', 'accept-cookies') == 'never':
-            return False
+            return False
-        else:
+        else:
-            return super().setCookiesFromUrl(cookies, url)
+            return super().setCookiesFromUrl(cookies, url)
-
+
-    def save(self):
+    def save(self):
-        """Save cookies to disk."""
+        """Save cookies to disk."""
-        lines = []
+        lines = []
-        for cookie in self.allCookies():
+        for cookie in self.allCookies():
-            if not cookie.isSessionCookie():
+            if not cookie.isSessionCookie():
-                lines.append(bytes(cookie.toRawForm()).decode('utf-8'))
+                lines.append(bytes(cookie.toRawForm()).decode('utf-8'))
-        self._linecp.data = lines
+        self._linecp.data = lines
-        self._linecp.save()
+        self._linecp.save()