summaryrefslogtreecommitdiffstats
path: root/gallery_dl/extractor/common.py
diff options
context:
space:
mode:
authorLibravatarUnit 193 <unit193@ubuntu.com>2020-04-29 17:42:33 -0400
committerLibravatarUnit 193 <unit193@ubuntu.com>2020-04-29 17:42:33 -0400
commitd5b96ce44b7809f5ae01e3e9d70a1d58fe21ccf5 (patch)
tree1302b36780656b71ccb4aebda4f7ea1e2c744e52 /gallery_dl/extractor/common.py
parentcf188f30e1c27bdb900fa2623a9ff91b944633b2 (diff)
New upstream version 1.13.5upstream/1.13.5
Diffstat (limited to 'gallery_dl/extractor/common.py')
-rw-r--r--gallery_dl/extractor/common.py12
1 files changed, 7 insertions, 5 deletions
diff --git a/gallery_dl/extractor/common.py b/gallery_dl/extractor/common.py
index 8986c99..3a282c2 100644
--- a/gallery_dl/extractor/common.py
+++ b/gallery_dl/extractor/common.py
@@ -99,18 +99,20 @@ class Extractor():
return response
if notfound and code == 404:
raise exception.NotFoundError(notfound)
+
+ reason = response.reason
if cloudflare.is_challenge(response):
self.log.info("Solving Cloudflare challenge")
response, domain, cookies = cloudflare.solve_challenge(
session, response, kwargs)
- if response.status_code >= 400:
- continue
- cloudflare.cookies.update(self.category, (domain, cookies))
- return response
+ if cookies:
+ cloudflare.cookies.update(
+ self.category, (domain, cookies))
+ return response
if cloudflare.is_captcha(response):
self.log.warning("Cloudflare CAPTCHA")
- msg = "'{} {}' for '{}'".format(code, response.reason, url)
+ msg = "'{} {}' for '{}'".format(code, reason, url)
if code < 500 and code != 429 and code != 430:
break