New upstream version 1.22.0.upstream/1.22.0

1 files changed, 11 insertions, 5 deletions

diff --git a/gallery_dl/extractor/common.py b/gallery_dl/extractor/common.py
index abb352c..cac8c2d 100644
--- a/gallery_dl/extractor/common.py
+++ b/gallery_dl/extractor/common.py
@@ -306,23 +306,29 @@ class Extractor():
                 cookiefile = util.expand_path(cookies)
                 try:
                     with open(cookiefile) as fp:
-                        cookies = util.load_cookiestxt(fp)
+                        util.cookiestxt_load(fp, self._cookiejar)
                 except Exception as exc:
                     self.log.warning("cookies: %s", exc)
                 else:
-                    self._update_cookies(cookies)
                     self._cookiefile = cookiefile
+            elif isinstance(cookies, (list, tuple)):
+                from ..cookies import load_cookies
+                try:
+                    load_cookies(self._cookiejar, cookies)
+                except Exception as exc:
+                    self.log.warning("cookies: %s", exc)
             else:
                 self.log.warning(
-                    "expected 'dict' or 'str' value for 'cookies' option, "
-                    "got '%s' (%s)", cookies.__class__.__name__, cookies)
+                    "Expected 'dict', 'list', or 'str' value for 'cookies' "
+                    "option, got '%s' (%s)",
+                    cookies.__class__.__name__, cookies)
 
     def _store_cookies(self):
         """Store the session's cookiejar in a cookies.txt file"""
         if self._cookiefile and self.config("cookies-update", True):
             try:
                 with open(self._cookiefile, "w") as fp:
-                    util.save_cookiestxt(fp, self._cookiejar)
+                    util.cookiestxt_store(fp, self._cookiejar)
             except OSError as exc:
                 self.log.warning("cookies: %s", exc)