[mastodon] use 'combine_dict()' to combine extractor info dicts

This commit is contained in:
Mike Fährmann
2020-04-05 21:45:00 +02:00
parent 220c06b86e
commit 4ae8a25567

View File

@@ -9,7 +9,7 @@
"""Extractors for mastodon instances""" """Extractors for mastodon instances"""
from .common import Extractor, Message from .common import Extractor, Message
from .. import text, config, exception from .. import text, util, config, exception
import re import re
@@ -158,7 +158,7 @@ def generate_extractors():
symtable = globals() symtable = globals()
extractors = config.get(("extractor",), "mastodon") extractors = config.get(("extractor",), "mastodon")
if extractors: if extractors:
EXTRACTORS.update(extractors) util.combine_dict(EXTRACTORS, extractors)
config.set(("extractor",), "mastodon", EXTRACTORS) config.set(("extractor",), "mastodon", EXTRACTORS)
for instance, info in EXTRACTORS.items(): for instance, info in EXTRACTORS.items():