Scrapy, a fast high-level web crawling & scraping framework for Python.
Deprecate scrapy.utils.datatypes.MergeDict in favor of collections.ChainMap
Eugenio Lacuesta62f3e2248114
diff --git a/scrapy/loader/processors.py b/scrapy/loader/processors.pyindex 468aec2cc..2acdc8093 100644--- a/scrapy/loader/processors.py+++ b/scrapy/loader/processors.py@@ -3,10 +3,13 @@ This module provides some commonly used processors for Item Loaders.See documentation in docs/topics/loaders.rst"""+try:+ from collections import ChainMap+except ImportError:+ from scrapy.utils.datatypes import MergeDict as ChainMapfrom scrapy.utils.misc import arg_to_iter-from scrapy.utils.datatypes import MergeDict-from .common import wrap_loader_context+from scrapy.loader.common import wrap_loader_contextclass MapCompose(object):@@ -18,7 +21,7 @@ class MapCompose(object):def __call__(self, value, loader_context=None):values = arg_to_iter(value)if loader_context:- context = MergeDict(loader_context, self.default_loader_context)+ context = ChainMap(loader_context, self.default_loader_context)else:context = self.default_loader_contextwrapped_funcs = [wrap_loader_context(f, context) for f in self.functions]@@ -45,7 +48,7 @@ class Compose(object):def __call__(self, value, loader_context=None):if loader_context:- context = MergeDict(loader_context, self.default_loader_context)+ context = ChainMap(loader_context, self.default_loader_context)else:context = self.default_loader_contextwrapped_funcs = [wrap_loader_context(f, context) for f in self.functions]diff --git a/scrapy/utils/datatypes.py b/scrapy/utils/datatypes.pyindex eb373c501..fbc41f760 100644--- a/scrapy/utils/datatypes.py+++ b/scrapy/utils/datatypes.py@@ -245,6 +245,13 @@ class MergeDict(object):first occurrence will be used."""def __init__(self, *dicts):+ if six.PY3:+ warnings.warn(+ "scrapy.utils.datatypes.MergeDict is deprecated in favor "+ "of collections.ChainMap (introduced in Python 3.3)",+ category=ScrapyDeprecationWarning,+ stacklevel=2,+ )self.dicts = dictsdef __getitem__(self, key):