New upstream version 1.26.0.upstream/1.26.0

1 files changed, 8 insertions, 9 deletions

diff --git a/gallery_dl/__init__.py b/gallery_dl/__init__.py
index 1450e8f..d3a0f58 100644
--- a/gallery_dl/__init__.py
+++ b/gallery_dl/__init__.py
@@ -44,13 +44,13 @@ def main():
             config.load(args.configs_json, strict=True)
         if args.configs_yaml:
             import yaml
-            config.load(args.configs_yaml, strict=True, load=yaml.safe_load)
+            config.load(args.configs_yaml, strict=True, loads=yaml.safe_load)
         if args.configs_toml:
             try:
                 import tomllib as toml
             except ImportError:
                 import toml
-            config.load(args.configs_toml, strict=True, load=toml.loads)
+            config.load(args.configs_toml, strict=True, loads=toml.loads)
         if args.filename:
             filename = args.filename
             if filename == "/O":
@@ -196,16 +196,15 @@ def main():
 
         elif args.list_extractors:
             write = sys.stdout.write
-            fmt = "{}\n{}\nCategory: {} - Subcategory: {}{}\n\n".format
+            fmt = ("{}{}\nCategory: {} - Subcategory: {}"
+                   "\nExample : {}\n\n").format
 
             for extr in extractor.extractors():
-                if not extr.__doc__:
-                    continue
-                test = next(extr._get_tests(), None)
                 write(fmt(
-                    extr.__name__, extr.__doc__,
+                    extr.__name__,
+                    "\n" + extr.__doc__ if extr.__doc__ else "",
                     extr.category, extr.subcategory,
-                    "\nExample : " + test[0] if test else "",
+                    extr.example,
                 ))
 
         elif args.clear_cache:
@@ -297,7 +296,7 @@ def main():
             return retval
 
     except KeyboardInterrupt:
-        sys.exit("\nKeyboardInterrupt")
+        raise SystemExit("\nKeyboardInterrupt")
     except BrokenPipeError:
         pass
     except OSError as exc: