Scrapy, a fast high-level web crawling & scraping framework for Python.
Merge remote-tracking branch 'upstream/master' into flake8-remove-e128
Eugenio Lacuesta89d0c98f7a6e
diff --cc pytest.iniindex b8a87b214,c141d49a4..8177fedd3--- a/pytest.ini+++ b/pytest.ini@@@ -172,46 -174,47 +172,47 @@@ flake8-ignoretests/spiders.py E501tests/test_closespider.py E501tests/test_command_fetch.py E501- tests/test_command_parse.py E501 E128- tests/test_command_shell.py E501 E128- tests/test_commands.py E128 E501- tests/test_contracts.py E501 E128+ tests/test_command_parse.py E501+ tests/test_command_shell.py E501+ tests/test_commands.py E501+ tests/test_contracts.py E501- tests/test_crawl.py E501 E741+ tests/test_crawl.py E501tests/test_crawler.py E501tests/test_dependencies.py E501- tests/test_downloader_handlers.py E128 E501+ tests/test_downloader_handlers.py E501tests/test_downloadermiddleware.py E501tests/test_downloadermiddleware_ajaxcrawlable.py E501- tests/test_downloadermiddleware_cookies.py E741 E501- tests/test_downloadermiddleware_cookies.py E501 E128++ tests/test_downloadermiddleware_cookies.py E501tests/test_downloadermiddleware_defaultheaders.py E501tests/test_downloadermiddleware_downloadtimeout.py E501tests/test_downloadermiddleware_httpcache.py E501tests/test_downloadermiddleware_httpcompression.py E501tests/test_downloadermiddleware_decompression.py E501- tests/test_downloadermiddleware_httpproxy.py E501 E128- tests/test_downloadermiddleware_redirect.py E501 E128- tests/test_downloadermiddleware_retry.py E501 E128+ tests/test_downloadermiddleware_httpproxy.py E501+ tests/test_downloadermiddleware_redirect.py E501+ tests/test_downloadermiddleware_retry.py E501tests/test_downloadermiddleware_robotstxt.py E501tests/test_downloadermiddleware_stats.py E501- tests/test_dupefilters.py E501 E741- tests/test_dupefilters.py E501 E128- tests/test_engine.py E501 E128- tests/test_exporters.py E501 E128++ tests/test_dupefilters.py E501+ tests/test_engine.py E501+ tests/test_exporters.py E501tests/test_feedexport.py E501tests/test_http_cookies.py E501tests/test_http_headers.py E501- tests/test_http_request.py E402 E501 E128 E128- tests/test_http_response.py E501 E128- tests/test_item.py E128+ tests/test_http_request.py E402 E501+ tests/test_http_response.py E501++ tests/test_item.py E501tests/test_link.py E501- tests/test_linkextractors.py E501 E128- tests/test_loader.py E128 E501 E741- tests/test_logformatter.py E128 E501- tests/test_mail.py E128 E501- tests/test_middleware.py E501 E128- tests/test_pipeline_crawl.py E501 E128+ tests/test_linkextractors.py E501+ tests/test_loader.py E501 E741+ tests/test_logformatter.py E501+ tests/test_mail.py E501+ tests/test_middleware.py E501+ tests/test_pipeline_crawl.py E501tests/test_pipeline_files.py E501tests/test_pipeline_images.py E501- tests/test_pipeline_media.py E501 E741- tests/test_proxy_connect.py E501 E741- tests/test_pipeline_media.py E501 E128++ tests/test_pipeline_media.py E501+ tests/test_proxy_connect.py E501tests/test_request_cb_kwargs.py E501tests/test_responsetypes.py E501tests/test_robotstxt_interface.py E501 E501@@@ -219,29 -222,27 +220,27 @@@tests/test_selector.py E501tests/test_spider.py E501tests/test_spidermiddleware.py E501- tests/test_spidermiddleware_httperror.py E128 E501- tests/test_spidermiddleware_offsite.py E501 E128+ tests/test_spidermiddleware_httperror.py E501+ tests/test_spidermiddleware_offsite.py E501tests/test_spidermiddleware_output_chain.py E501- tests/test_spidermiddleware_referer.py E501 E501- tests/test_squeues.py E501 E741+ tests/test_spidermiddleware_referer.py E501+ tests/test_squeues.py E501tests/test_utils_asyncio.py E501- tests/test_utils_conf.py E501 E128+ tests/test_utils_conf.py E501tests/test_utils_curl.py E501tests/test_utils_datatypes.py E402 E501tests/test_utils_defer.py E501tests/test_utils_deprecate.py E501- tests/test_utils_http.py E501 E128- tests/test_utils_iterators.py E501 E128+ tests/test_utils_http.py E501+ tests/test_utils_iterators.py E501- tests/test_utils_log.py E741tests/test_utils_python.py E501- tests/test_utils_reqser.py E501 E128- tests/test_utils_request.py E501 E128+ tests/test_utils_reqser.py E501+ tests/test_utils_request.py E501tests/test_utils_response.py E501- tests/test_utils_signal.py E741- tests/test_utils_sitemap.py E128 E501+ tests/test_utils_sitemap.py E501tests/test_utils_url.py E501 E501- tests/test_webclient.py E501 E128 E402+ tests/test_webclient.py E501 E402tests/test_cmdline/__init__.py E501- tests/test_settings/__init__.py E501 E128- tests/test_spiderloader/__init__.py E128 E501+ tests/test_settings/__init__.py E501+ tests/test_spiderloader/__init__.py E501tests/test_utils_misc/__init__.py E501diff --cc tests/test_dupefilters.pyindex 38b95b710,ee1794f4f..41a8d16bc--- a/tests/test_dupefilters.py+++ b/tests/test_dupefilters.py@@@ -177,13 -177,10 +177,13 @@@ class RFPDupeFilterTest(unittest.TestCadupefilter.log(r2, spider)assert crawler.stats.get_value('dupefilter/filtered') == 2- l.check_present(- log.check_present(('scrapy.dupefilters', 'DEBUG',- ('Filtered duplicate request: <GET http://scrapytest.org/index.html>'- ' - no more duplicates will be shown'- ' (see DUPEFILTER_DEBUG to show all duplicates)')))++ log.check_present(+ (+ 'scrapy.dupefilters',+ 'DEBUG',+ 'Filtered duplicate request: <GET http://scrapytest.org/index.html> - no more duplicates will be shown (see DUPEFILTER_DEBUG to show all duplicates)'+ )+ )dupefilter.close('finished')@@@ -206,19 -203,11 +206,19 @@@dupefilter.log(r2, spider)assert crawler.stats.get_value('dupefilter/filtered') == 2- l.check_present(- log.check_present(('scrapy.dupefilters', 'DEBUG',- ('Filtered duplicate request: <GET http://scrapytest.org/index.html>'- ' (referer: None)')))- log.check_present(('scrapy.dupefilters', 'DEBUG',- ('Filtered duplicate request: <GET http://scrapytest.org/index.html>'- ' (referer: http://scrapytest.org/INDEX.html)')))++ log.check_present(+ (+ 'scrapy.dupefilters',+ 'DEBUG',+ 'Filtered duplicate request: <GET http://scrapytest.org/index.html> (referer: None)'+ )+ )- l.check_present(++ log.check_present(+ (+ 'scrapy.dupefilters',+ 'DEBUG',+ 'Filtered duplicate request: <GET http://scrapytest.org/index.html> (referer: http://scrapytest.org/INDEX.html)'+ )+ )dupefilter.close('finished')