commit: 1d88b3e6e6e59e4b52305faf6c1bf1fd69c555ee
parent 9235b5091cedcc21c8dc32d4b292340edeee4ed0
Author: aegamesi <admin.aegamesi@gmail.com>
Date: Sat, 29 Apr 2017 22:56:33 -0700
[YoutubeDL] Recognize expires=0 as session cookies and send session cookies with requests
Diffstat:
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py
@@ -2300,7 +2300,13 @@ class YoutubeDL(object):
self.cookiejar = compat_cookiejar.MozillaCookieJar(
opts_cookiefile)
if os.access(opts_cookiefile, os.R_OK):
- self.cookiejar.load()
+ self.cookiejar.load(ignore_discard=True, ignore_expires=True)
+ # Force CookieJar to treat 'expires=0' cookies as session/discard cookies
+ # Fixes https://bugs.python.org/issue17164
+ for cookie in self.cookiejar:
+ if cookie.expires == 0:
+ cookie.expires = None
+ cookie.discard = True
cookie_processor = YoutubeDLCookieProcessor(self.cookiejar)
if opts_proxy is not None: