Skip to content

Scrapy, a fast high-level web crawling & scraping framework for Python.

set defalut value "" to FILES_STORE_GCS_ACL

rhoboro560ee623fd84
diff --git a/scrapy/pipelines/files.py b/scrapy/pipelines/files.py
index 8ea70e5d1..510cc23c7 100644
--- a/scrapy/pipelines/files.py
+++ b/scrapy/pipelines/files.py
@@ -319,7 +319,7 @@ class FilesPipeline(MediaPipeline):
gcs_store = cls.STORE_SCHEMES['gs']
gcs_store.GCS_PROJECT_ID = settings['GCS_PROJECT_ID']
- gcs_store.POLICY = settings['FILES_STORE_GCS_ACL']
+ gcs_store.POLICY = settings['FILES_STORE_GCS_ACL'] or None
store_uri = settings['FILES_STORE']
return cls(store_uri, settings=settings)
diff --git a/scrapy/pipelines/images.py b/scrapy/pipelines/images.py
index 5cdddce49..95323c613 100644
--- a/scrapy/pipelines/images.py
+++ b/scrapy/pipelines/images.py
@@ -93,7 +93,7 @@ class ImagesPipeline(FilesPipeline):
gcs_store = cls.STORE_SCHEMES['gs']
gcs_store.GCS_PROJECT_ID = settings['GCS_PROJECT_ID']
- gcs_store.POLICY = settings['IMAGES_STORE_GCS_ACL']
+ gcs_store.POLICY = settings['IMAGES_STORE_GCS_ACL'] or None
store_uri = settings['IMAGES_STORE']
return cls(store_uri, settings=settings)
diff --git a/scrapy/settings/default_settings.py b/scrapy/settings/default_settings.py
index d7ca8a835..36e17ef6b 100644
--- a/scrapy/settings/default_settings.py
+++ b/scrapy/settings/default_settings.py
@@ -159,7 +159,7 @@ FEED_EXPORTERS_BASE = {
FEED_EXPORT_INDENT = 0
FILES_STORE_S3_ACL = 'private'
-FILES_STORE_GCS_ACL = None
+FILES_STORE_GCS_ACL = ''
FTP_USER = 'anonymous'
FTP_PASSWORD = 'guest'
@@ -182,7 +182,7 @@ HTTPPROXY_ENABLED = True
HTTPPROXY_AUTH_ENCODING = 'latin-1'
IMAGES_STORE_S3_ACL = 'private'
-IMAGES_STORE_GCS_ACL = None
+IMAGES_STORE_GCS_ACL = ''
ITEM_PROCESSOR = 'scrapy.pipelines.ItemPipelineManager'