aboutsummaryrefslogtreecommitdiffstats
path: root/gallery_dl/__init__.py
diff options
context:
space:
mode:
authorLibravatarUnit 193 <unit193@unit193.net>2020-11-13 19:17:03 -0500
committerLibravatarUnit 193 <unit193@unit193.net>2020-11-13 19:17:03 -0500
commit209a3c800871cd68edd2bc7ae661a24ecd496d2d (patch)
treecf81c47ab57540b58292295c7d5641e9d2668291 /gallery_dl/__init__.py
parent5dc7d6f5902ddaee5223d041d5c10060f0c72430 (diff)
New upstream version 1.15.3.upstream/1.15.3
Diffstat (limited to 'gallery_dl/__init__.py')
-rw-r--r--gallery_dl/__init__.py10
1 files changed, 8 insertions, 2 deletions
diff --git a/gallery_dl/__init__.py b/gallery_dl/__init__.py
index e71a5b0..6c2c713 100644
--- a/gallery_dl/__init__.py
+++ b/gallery_dl/__init__.py
@@ -9,7 +9,7 @@
from __future__ import unicode_literals, print_function
__author__ = "Mike Fährmann"
-__copyright__ = "Copyright 2014-2018 Mike Fährmann"
+__copyright__ = "Copyright 2014-2020 Mike Fährmann"
__license__ = "GPLv2"
__maintainer__ = "Mike Fährmann"
__email__ = "mike_faehrmann@web.de"
@@ -129,6 +129,12 @@ def main():
for opts in args.options:
config.set(*opts)
+ # extractor modules
+ modules = config.get(("extractor",), "modules")
+ if modules is not None:
+ extractor.modules = modules
+ extractor._module_iter = iter(modules)
+
# loglevels
output.configure_logging(args.loglevel)
if args.loglevel >= logging.ERROR:
@@ -142,7 +148,7 @@ def main():
head = ""
try:
out, err = subprocess.Popen(
- ("git", "rev-parse", "--short", "HEAD"),
+ ("git", "rev-parse", "--short", "HEAD"),
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
cwd=os.path.dirname(os.path.abspath(__file__)),