Mirrors/gallery-dl
1
0
Fork 0
mirror of https://github.com/mikf/gallery-dl.git synced 2024-11-22 02:32:33 +01:00
Code Issues Releases Wiki Activity

[ytdl] ignore SyntaxErrors when trying to import a module

Browse Source
This commit is contained in:
Mike Fährmann 2024-08-29 19:28:08 +02:00
parent cf8e04d999
commit 127aa45834
No known key found for this signature in database
GPG Key ID: 5680CA389D365A88
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gallery_dl/downloader/ytdl.py
View File

@ -42,8 +42,9 @@ class YoutubeDLDownloader(DownloaderBase):
if not ytdl_instance: if not ytdl_instance:
try: try:
module = ytdl.import_module(self.config("module")) module = ytdl.import_module(self.config("module"))
except ImportError as exc: except (ImportError, SyntaxError) as exc:
self.log.error("Cannot import module '%s'", exc.name) self.log.error("Cannot import module '%s'",
getattr(exc, "name", ""))
self.log.debug("", exc_info=True) self.log.debug("", exc_info=True)
self.download = lambda u, p: False self.download = lambda u, p: False
return False return False

2
gallery_dl/ytdl.py
View File

@ -18,7 +18,7 @@ def import_module(module_name):
if module_name is None: if module_name is None:
try: try:
return __import__("yt_dlp") return __import__("yt_dlp")
except ImportError: except (ImportError, SyntaxError):
return __import__("youtube_dl") return __import__("youtube_dl")
return __import__(module_name.replace("-", "_")) return __import__(module_name.replace("-", "_"))

2
test/test_ytdl.py
View File

@ -22,7 +22,7 @@ class Test_CommandlineArguments(unittest.TestCase):
def setUpClass(cls): def setUpClass(cls):
try: try:
cls.module = __import__(cls.module_name) cls.module = __import__(cls.module_name)
except ImportError: except (ImportError, SyntaxError):
raise unittest.SkipTest("cannot import module '{}'".format( raise unittest.SkipTest("cannot import module '{}'".format(
cls.module_name)) cls.module_name))
cls.default = ytdl.parse_command_line(cls.module, []) cls.default = ytdl.parse_command_line(cls.module, [])