From 7e6981dda6d89673feae23808891b7e8832cf3d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= Date: Tue, 1 Feb 2022 01:37:03 +0100 Subject: [PATCH] rename 'disabletls12' to 'tls12' and let config options override any default settings --- gallery_dl/extractor/common.py | 7 +++++-- gallery_dl/extractor/patreon.py | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/gallery_dl/extractor/common.py b/gallery_dl/extractor/common.py index 3189ceae..08aa7203 100644 --- a/gallery_dl/extractor/common.py +++ b/gallery_dl/extractor/common.py @@ -38,7 +38,7 @@ class Extractor(): request_interval = 0.0 request_interval_min = 0.0 request_timestamp = 0.0 - disabletls12 = False + tls12 = True def __init__(self, match): self.log = logging.getLogger(self.category) @@ -277,7 +277,10 @@ class Extractor(): else: source_address = (source_address[0], source_address[1]) - if self.config("disabletls12") or self.disabletls12: + tls12 = self.config("tls12") + if tls12 is None: + tls12 = self.tls12 + if not tls12: ssl_options |= ssl.OP_NO_TLSv1_2 self.log.debug("TLS 1.2 disabled.") diff --git a/gallery_dl/extractor/patreon.py b/gallery_dl/extractor/patreon.py index 83005248..051f1ef9 100644 --- a/gallery_dl/extractor/patreon.py +++ b/gallery_dl/extractor/patreon.py @@ -25,8 +25,8 @@ class PatreonExtractor(Extractor): filename_fmt = "{id}_{title}_{num:>02}.{extension}" archive_fmt = "{id}_{num}" browser = "firefox" + tls12 = False _warning = True - disabletls12 = True def items(self):