diff -r 98376cf9133d Lib/test/test_http_cookiejar.py --- a/Lib/test/test_http_cookiejar.py Tue Jan 06 22:16:10 2015 -0800 +++ b/Lib/test/test_http_cookiejar.py Wed Jan 07 14:55:00 2015 +0100 @@ -1578,6 +1578,30 @@ 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. + 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()