Make MozillaCookieJar use curl's format for session cookies

Author: Rémi Lapeyre

Lib/http/cookiejar.py

@@ -2033,7 +2033,8 @@ def _really_load(self, f, filename, ignore_discard, ignore_expires):
                 assert domain_specified == initial_dot
 
                 discard = False
-                if expires == "":
+                # curl and Wget set expires to 0 for session cookies.
+                if expires == "0" or expires == "":
                     expires = None
                     discard = True
 
@@ -2081,7 +2082,7 @@ def save(self, filename=None, ignore_discard=False, ignore_expires=False):
                 if cookie.expires is not None:
                     expires = str(cookie.expires)
                 else:
-                    expires = ""
+                    expires = "0"
                 if cookie.value is None:
                     # cookies.txt regards 'Set-Cookie: foo' as a cookie
                     # with no name, whereas http.cookiejar regards it as a

Lib/test/test_http_cookiejar.py

@@ -1689,6 +1689,31 @@ def save_and_restore(cj, ignore_discard):
         self.assertEqual(len(new_c), 4)  # 2 of them discarded on save
         self.assertIn("name='foo1', value='bar'", repr(new_c))
 
+        # Check compatibility with curl / wget cookiejar format.
+        # See issue 17164
+        try:
+            expires = int(time.time() + 3600)
+            with open(filename, "w") as f:
+                f.write(MozillaCookieJar.header)
+                f.write("www.foo.com\tFALSE\t/\tFALSE\t%u\tfoo1\tbar\n" %
+                        expires)
+                f.write("www.foo.com\tFALSE\t/\tFALSE\t0\tfoo2\tbar\n")
+                f.write("www.foo.com\tFALSE\t/\tFALSE\t\tfoo3\tbar\n")
+            c = MozillaCookieJar()
+            c.revert(filename)
+            self.assertEqual(len(c), 1)
+            c.revert(filename, ignore_discard = True)
+            self.assertEqual(len(c), 3)
+            c.save(filename, ignore_discard = True)
+            with open(filename, "r") as f:
+                for line in f:
+                    if line == '\n' or line.startswith('#'):
+                        continue
+                    self.assertRegex(line.split('\t')[4], '^\d+$')
+        finally:
+            try: os.unlink(filename)
+            except OSError: pass
+
     def test_netscape_misc(self):
         # Some additional Netscape cookies tests.
         c = CookieJar()

Misc/NEWS.d/next/Library/2019-02-08-17-33-49.bpo-17164.k6W5Sp.rst

@@ -0,0 +1,2 @@
+`MozillaCookieJar` is now compatible with curl and wget cookiejar file
+format. Contributed by Jérémie Detrey.