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

Fix too long lines

This commit is contained in:
BroodingKangaroo 2020-05-21 14:57:03 +03:00
parent 5f6c1dceb1
commit 677e619d37
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scrapy/extensions/feedexport.py
View File

@ -364,7 +364,9 @@ class FeedExporter:
"""
if not self.storage_batch_item_count or '%(batch_time)s' in uri or '%(batch_id)s' in uri:
return True
logger.error('%(batch_time)s or %(batch_id)s must be in uri if FEED_STORAGE_BATCH_ITEM_COUNT setting is specified')
logger.error(
'%(batch_time)s or %(batch_id)s must be in uri if FEED_STORAGE_BATCH_ITEM_COUNT setting is specified'
)
return False
def _storage_supported(self, uri):

20
tests/test_feedexport.py
View File

@ -1204,12 +1204,20 @@ class BatchDeliveriesTest(FeedExportTestBase):
items = [dict({'foo': u'FOO', 'bar': u'BAR'}), dict({'foo': u'FOO1', 'bar': u'BAR1'})]
formats = {
'json': [u'[\n{"bar": "BAR"}\n]'.encode('utf-8'),
u'[\n{"bar": "BAR1"}\n]'.encode('utf-8')],
'xml': [u'<?xml version="1.0" encoding="latin-1"?>\n<items>\n <item>\n <foo>FOO</foo>\n </item>\n</items>'.encode('latin-1'),
u'<?xml version="1.0" encoding="latin-1"?>\n<items>\n <item>\n <foo>FOO1</foo>\n </item>\n</items>'.encode('latin-1')],
'csv': [u'bar,foo\r\nBAR,FOO\r\n'.encode('utf-8'),
u'bar,foo\r\nBAR1,FOO1\r\n'.encode('utf-8')],
'json': ['[\n{"bar": "BAR"}\n]'.encode('utf-8'),
'[\n{"bar": "BAR1"}\n]'.encode('utf-8')],
'xml': [
(
'<?xml version="1.0" encoding="latin-1"?>\n'
'<items>\n <item>\n <foo>FOO</foo>\n </item>\n</items>'
).encode('latin-1'),
(
'<?xml version="1.0" encoding="latin-1"?>\n'
'<items>\n <item>\n <foo>FOO1</foo>\n </item>\n</items>'
).encode('latin-1')
],
'csv': ['bar,foo\r\nBAR,FOO\r\n'.encode('utf-8'),
'bar,foo\r\nBAR1,FOO1\r\n'.encode('utf-8')],
}
settings = {