diff --git a/gallery_dl/extractor/common.py b/gallery_dl/extractor/common.py index 1946f815..d61f1020 100644 --- a/gallery_dl/extractor/common.py +++ b/gallery_dl/extractor/common.py @@ -8,7 +8,6 @@ """Common classes and constants used by extractor modules.""" -import os import re import time import netrc @@ -401,21 +400,5 @@ def generate_extractors(extractor_data, symtable, classes): # Reduce strictness of the expected magic string in cookiejar files. # (This allows the use of Wget-generated cookiejars without modification) - http.cookiejar.MozillaCookieJar.magic_re = re.compile( "#( Netscape)? HTTP Cookie File", re.IGNORECASE) - - -# The first import of requests happens inside this file. -# If we are running on Windows and the from requests expected certificate file -# is missing (which happens in a standalone executable from py2exe), the -# 'verify' option is globally set to False to avoid an exception being thrown -# when attempting to access https:// URLs. - -if os.name == "nt": - import os.path - import requests.certs - import requests.packages.urllib3 as ulib3 - if not os.path.isfile(requests.certs.where()): - config.set(("verify",), False) - ulib3.disable_warnings(ulib3.exceptions.InsecureRequestWarning) diff --git a/gallery_dl/extractor/luscious.py b/gallery_dl/extractor/luscious.py index 66163b0c..71c32ef5 100644 --- a/gallery_dl/extractor/luscious.py +++ b/gallery_dl/extractor/luscious.py @@ -62,7 +62,7 @@ class LusciousAlbumExtractor(LusciousBase, GalleryExtractor): test = ( ("https://luscious.net/albums/okinami-no-koigokoro_277031/", { "url": "7e4984a271a1072ac6483e4228a045895aff86f3", - "keyword": "b5cc69b36689e7360876dd1f8ef2395782eb493f", + "keyword": "1b1e8981afa250a0181e31b15ce3cbaa37c00856", "content": "b3a747a6464509440bd0ff6d1267e6959f8d6ff3", }), ("https://luscious.net/albums/virgin-killer-sweater_282582/", { diff --git a/test/test_results.py b/test/test_results.py index a7f4a414..fb786997 100644 --- a/test/test_results.py +++ b/test/test_results.py @@ -25,7 +25,6 @@ TRAVIS_SKIP = { # temporary issues, etc. BROKEN = { - "acidimg", "mangapark", }