From 726c6f01ae18bb71211925fd83908be904d8a7dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= <mike_faehrmann@web.de>
Date: Fri, 7 Jul 2017 18:01:46 +0200
Subject: [PATCH] allow 'cookies' config option to be a dictionary

---
 gallery_dl/extractor/common.py | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/gallery_dl/extractor/common.py b/gallery_dl/extractor/common.py
index 23b39c1c..d2355701 100644
--- a/gallery_dl/extractor/common.py
+++ b/gallery_dl/extractor/common.py
@@ -33,12 +33,15 @@ class Extractor():
 
         cookies = self.config("cookies")
         if cookies:
-            try:
-                cj = http.cookiejar.MozillaCookieJar()
-                cj.load(cookies)
-                self.session.cookies = cj
-            except OSError as exc:
-                self.log.warning("cookies: %s", exc)
+            if isinstance(cookies, dict):
+                cj = cookies
+            else:
+                try:
+                    cj = http.cookiejar.MozillaCookieJar()
+                    cj.load(cookies)
+                except OSError as exc:
+                    self.log.warning("cookies: %s", exc)
+            self.session.cookies.update(cj)
 
     def __iter__(self):
         return self.items()