diff --git a/scrapy/settings/__init__.py b/scrapy/settings/__init__.py index 14c93bef2..6b53c7a79 100644 --- a/scrapy/settings/__init__.py +++ b/scrapy/settings/__init__.py @@ -1,11 +1,17 @@ import six import json import copy -from collections import MutableMapping +import collections from importlib import import_module from pprint import pformat -from . import default_settings +from scrapy.settings import default_settings + + +if six.PY3: + MutableMapping = collections.abc.MutableMapping +else: + MutableMapping = collections.MutableMapping SETTINGS_PRIORITIES = { diff --git a/tests/test_utils_datatypes.py b/tests/test_utils_datatypes.py index 5b83869b8..618050fef 100644 --- a/tests/test_utils_datatypes.py +++ b/tests/test_utils_datatypes.py @@ -1,11 +1,18 @@ import copy import unittest -from collections import Mapping, MutableMapping + +import six +if six.PY3: + from collections.abc import Mapping, MutableMapping +else: + from collections.abc import Mapping, MutableMapping from scrapy.utils.datatypes import CaselessDict, SequenceExclude + __doctests__ = ['scrapy.utils.datatypes'] + class CaselessDictTest(unittest.TestCase): def test_init_dict(self):