Merge pull request #2649 from pawelmhm/logformatter-2647

[MRG+2] [logformatter] 'flags' format spec backward compatibility
This commit is contained in:
Paul Tremberth 2017-03-21 10:51:31 +01:00 committed by GitHub
commit 776129a951
2 changed files with 27 additions and 0 deletions

View File

@ -43,6 +43,8 @@ class LogFormatter(object):
'request_flags' : request_flags,
'referer': referer_str(request),
'response_flags': response_flags,
# backward compatibility with Scrapy logformatter below 1.4 version
'flags': response_flags
}
}

View File

@ -64,5 +64,30 @@ class LoggingContribTest(unittest.TestCase):
assert all(isinstance(x, six.text_type) for x in lines)
self.assertEqual(lines, [u"Scraped from <200 http://www.example.com>", u'name: \xa3'])
class LogFormatterSubclass(LogFormatter):
def crawled(self, request, response, spider):
kwargs = super(LogFormatterSubclass, self).crawled(
request, response, spider)
CRAWLEDMSG = (
u"Crawled (%(status)s) %(request)s (referer: "
u"%(referer)s)%(flags)s"
)
return {
'level': kwargs['level'],
'msg': CRAWLEDMSG,
'args': kwargs['args']
}
class LogformatterSubclassTest(LoggingContribTest):
def setUp(self):
self.formatter = LogFormatterSubclass()
self.spider = Spider('default')
def test_flags_in_request(self):
pass
if __name__ == "__main__":
unittest.main()