Scrapy, a fast high-level web crawling & scraping framework for Python.
Handle Tuple type on getdictorlist method, bump 3.12 python version
Laerte Pereirab06936f11174
diff --git a/.github/workflows/tests-ubuntu.yml b/.github/workflows/tests-ubuntu.ymlindex 54b3fbaa2..c2b686628 100644--- a/.github/workflows/tests-ubuntu.yml+++ b/.github/workflows/tests-ubuntu.yml@@ -48,13 +48,13 @@ jobs:env:TOXENV: botocore- - python-version: "3.12.0-beta.4"+ - python-version: "3.12.0-rc.1"env:TOXENV: py- - python-version: "3.12.0-beta.4"+ - python-version: "3.12.0-rc.1"env:TOXENV: asyncio- - python-version: "3.12.0-beta.4"+ - python-version: "3.12.0-rc.1"env:TOXENV: extra-depsdiff --git a/scrapy/settings/__init__.py b/scrapy/settings/__init__.pyindex bc82cc098..ba9727bac 100644--- a/scrapy/settings/__init__.py+++ b/scrapy/settings/__init__.py@@ -238,7 +238,7 @@ class BaseSettings(MutableMapping[_SettingsKeyT, Any]):def getdictorlist(self,name: _SettingsKeyT,- default: Union[Dict[Any, Any], List[Any], None] = None,+ default: Union[Dict[Any, Any], List[Any], Tuple[Any], None] = None,) -> Union[Dict[Any, Any], List[Any]]:"""Get a setting value as either a :class:`dict` or a :class:`list`.@@ -271,6 +271,8 @@ class BaseSettings(MutableMapping[_SettingsKeyT, Any]):return value_loadedexcept ValueError:return value.split(",")+ if isinstance(value, tuple):+ return list(value)assert isinstance(value, (dict, list))return copy.deepcopy(value)diff --git a/tests/test_feedexport.py b/tests/test_feedexport.pyindex 42fa25b1d..6b82974fa 100644--- a/tests/test_feedexport.py+++ b/tests/test_feedexport.py@@ -1321,6 +1321,17 @@ class FeedExportTest(FeedExportTestBase):yield self.assertExportedCsv(items, ["foo", "egg"], rows_csv)yield self.assertExportedJsonLines(items, rows_jl)+ @defer.inlineCallbacks+ def test_export_tuple(self):+ items = [+ {"foo": "bar1", "egg": "spam1"},+ {"foo": "bar2", "egg": "spam2", "baz": "quux"},+ ]++ settings = {"FEED_EXPORT_FIELDS": ("foo", "baz")}+ rows = [{"foo": "bar1", "baz": ""}, {"foo": "bar2", "baz": "quux"}]+ yield self.assertExported(items, ["foo", "baz"], rows, settings=settings)+@defer.inlineCallbacksdef test_export_feed_export_fields(self):# FEED_EXPORT_FIELDS option allows to order export fields