Skip to content

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

Merge branch 'master' into fix-pycodestyle-e731

Eugenio Lacuesta2265c1fda910
diff --cc pytest.ini
index 4b655b8d5,da0f68e20..d38bcec5f
--- a/pytest.ini
+++ b/pytest.ini
@@@ -35,27 -35,27 +35,27 @@@ flake8-ignore
scrapy/commands/check.py E501
scrapy/commands/crawl.py E501
scrapy/commands/edit.py E501
- scrapy/commands/fetch.py E401 E501 E128 E731
+ scrapy/commands/fetch.py E401 E501 E128
- scrapy/commands/genspider.py E128 E501 E502
+ scrapy/commands/genspider.py E128 E501
- scrapy/commands/parse.py E128 E501 E731
+ scrapy/commands/parse.py E128 E501
scrapy/commands/runspider.py E501
scrapy/commands/settings.py E128
- scrapy/commands/shell.py E128 E501 E502
+ scrapy/commands/shell.py E128 E501
scrapy/commands/startproject.py E127 E501 E128
scrapy/commands/version.py E501 E128
# scrapy/contracts
scrapy/contracts/__init__.py E501 W504
scrapy/contracts/default.py E128
# scrapy/core
- scrapy/core/engine.py E501 E128 E127 E502
+ scrapy/core/engine.py E501 E128 E127
scrapy/core/scheduler.py E501
scrapy/core/scraper.py E501 E128 W504
- scrapy/core/spidermw.py E501 E731 E126
+ scrapy/core/spidermw.py E501 E126
scrapy/core/downloader/__init__.py E501
scrapy/core/downloader/contextfactory.py E501 E128 E126
- scrapy/core/downloader/middleware.py E501 E502
+ scrapy/core/downloader/middleware.py E501
scrapy/core/downloader/tls.py E501 E241
- scrapy/core/downloader/webclient.py E731 E501 E128 E126
+ scrapy/core/downloader/webclient.py E501 E128 E126
scrapy/core/downloader/handlers/__init__.py E501
scrapy/core/downloader/handlers/ftp.py E501 E128 E127
scrapy/core/downloader/handlers/http10.py E501
@@@ -214,7 -214,7 +214,7 @@@
tests/test_pipeline_crawl.py E501 E128 E126
tests/test_pipeline_files.py E501
tests/test_pipeline_images.py F841 E501
- tests/test_pipeline_media.py E501 E741 E128 E502
- tests/test_pipeline_media.py E501 E741 E731 E128
++ tests/test_pipeline_media.py E501 E741 E128
tests/test_proxy_connect.py E501 E741
tests/test_request_cb_kwargs.py E501
tests/test_responsetypes.py E501