RomanNum3ral
/
scrapy
mirror of https://github.com/scrapy/scrapy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

using blank string instead of None as default value as proposed by @kmike

This commit is contained in:
Victor Torres 2019-02-12 12:26:57 -02:00
parent c2dede27bd
commit 984e706fd2
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/topics/feed-exports.rst
View File

@ -312,7 +312,7 @@ The keys are URI schemes and the values are paths to storage classes.
FEED_STORAGE_S3_ACL
-------------------
Default: ``None``
Default: ``''`` (empty string)
A string containing a custom ACL for feeds exported to Amazon S3 by your project.

2
scrapy/extensions/feedexport.py
View File

@ -135,7 +135,7 @@ class S3FeedStorage(BlockingFeedStorage):
uri=uri,
access_key=crawler.settings['AWS_ACCESS_KEY_ID'],
secret_key=crawler.settings['AWS_SECRET_ACCESS_KEY'],
acl=crawler.settings['FEED_STORAGE_S3_ACL']
acl=crawler.settings['FEED_STORAGE_S3_ACL'] or None
)
def _store_in_thread(self, file):

2
scrapy/settings/default_settings.py
View File

@ -158,7 +158,7 @@ FEED_EXPORTERS_BASE = {
}
FEED_EXPORT_INDENT = 0
FEED_STORAGE_S3_ACL = None
FEED_STORAGE_S3_ACL = ''
FILES_STORE_S3_ACL = 'private'
FILES_STORE_GCS_ACL = ''