Skip to content

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

Merge remote-tracking branch 'upstream/master' into flake8-max-line-length

Eugenio Lacuesta25eeb77ba6ff
diff --cc pytest.ini
index ff923a2de,1a73b41be..f26e274d7
--- a/pytest.ini
+++ b/pytest.ini
@@@ -28,132 -27,225 +28,120 @@@ flake8-ignore
scrapy/core/downloader/handlers/http.py F401
scrapy/http/__init__.py F401
# Issues pending a review:
- # extras
- extras/qps-bench-server.py E501
- extras/qpsclient.py E501 E501
# scrapy/commands
- scrapy/commands/__init__.py E128 E501
- scrapy/commands/check.py E501
- scrapy/commands/crawl.py E501
- scrapy/commands/edit.py E501
- scrapy/commands/fetch.py E501 E128
- scrapy/commands/genspider.py E128 E501
- scrapy/commands/parse.py E128 E501
- scrapy/commands/runspider.py E501
+ scrapy/commands/__init__.py E128
- scrapy/commands/fetch.py E401 E128
++ scrapy/commands/fetch.py E128
+ scrapy/commands/genspider.py E128
+ scrapy/commands/parse.py E128
scrapy/commands/settings.py E128
- scrapy/commands/shell.py E128 E501
- scrapy/commands/startproject.py E501 E128
- scrapy/commands/version.py E501 E128
+ scrapy/commands/shell.py E128
- scrapy/commands/startproject.py E127 E128
++ scrapy/commands/startproject.py E128
+ scrapy/commands/version.py E128
# scrapy/contracts
- scrapy/contracts/__init__.py W504
- scrapy/contracts/__init__.py E501
scrapy/contracts/default.py E128
# scrapy/core
- scrapy/core/engine.py E128 E127
- scrapy/core/scraper.py E128 W504
- scrapy/core/engine.py E501 E128
- scrapy/core/scheduler.py E501
- scrapy/core/scraper.py E501 E128
- 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
- scrapy/core/downloader/tls.py E501
- scrapy/core/downloader/webclient.py E501 E128 E126
- scrapy/core/downloader/handlers/__init__.py E501
- scrapy/core/downloader/handlers/ftp.py E501 E128
- scrapy/core/downloader/handlers/http10.py E501
- scrapy/core/downloader/handlers/http11.py E501
- scrapy/core/downloader/handlers/s3.py E501 E128 E126
++ scrapy/core/engine.py E128
++ scrapy/core/scraper.py E128
+ scrapy/core/spidermw.py E126
+ scrapy/core/downloader/contextfactory.py E128 E126
+ scrapy/core/downloader/webclient.py E128 E126
- scrapy/core/downloader/handlers/ftp.py E128 E127
++ scrapy/core/downloader/handlers/ftp.py E128
+ scrapy/core/downloader/handlers/s3.py E128 E126
# scrapy/downloadermiddlewares
- scrapy/downloadermiddlewares/ajaxcrawl.py E501
- scrapy/downloadermiddlewares/decompression.py E501
- scrapy/downloadermiddlewares/defaultheaders.py E501
- scrapy/downloadermiddlewares/httpcache.py E501 E126
- scrapy/downloadermiddlewares/httpcompression.py E501 E128
- scrapy/downloadermiddlewares/httpproxy.py E501
- scrapy/downloadermiddlewares/redirect.py E501
- scrapy/downloadermiddlewares/retry.py E501 E126
- scrapy/downloadermiddlewares/robotstxt.py E501
- scrapy/downloadermiddlewares/stats.py E501
+ scrapy/downloadermiddlewares/httpcache.py E126
+ scrapy/downloadermiddlewares/httpcompression.py E128
- scrapy/downloadermiddlewares/redirect.py W504
+ scrapy/downloadermiddlewares/retry.py E126
# scrapy/extensions
- scrapy/extensions/closespider.py E128 E123
- scrapy/extensions/closespider.py E501 E128
- scrapy/extensions/corestats.py E501
- scrapy/extensions/feedexport.py E128 E501
- scrapy/extensions/httpcache.py E128 E501
- scrapy/extensions/memdebug.py E501
- scrapy/extensions/spiderstate.py E501
- scrapy/extensions/telnet.py E501
- scrapy/extensions/throttle.py E501
++ scrapy/extensions/closespider.py E128
+ scrapy/extensions/feedexport.py E128
+ scrapy/extensions/httpcache.py E128
- scrapy/extensions/telnet.py W504
# scrapy/http
- scrapy/http/request/form.py E123
- scrapy/http/common.py E501
- scrapy/http/cookies.py E501
- scrapy/http/request/__init__.py E501
- scrapy/http/request/form.py E501
- scrapy/http/request/json_request.py E501
- scrapy/http/response/__init__.py E501 E128
- scrapy/http/response/text.py E501 E128 E124
+ scrapy/http/response/__init__.py E128
+ scrapy/http/response/text.py E128 E124
# scrapy/linkextractors
- scrapy/linkextractors/__init__.py E402 W504
- scrapy/linkextractors/__init__.py E501 E402
- scrapy/linkextractors/lxmlhtml.py E501
++ scrapy/linkextractors/__init__.py E402
# scrapy/loader
- scrapy/loader/__init__.py E501 E128
- scrapy/loader/processors.py E501
+ scrapy/loader/__init__.py E128
# scrapy/pipelines
- scrapy/pipelines/__init__.py E501
- scrapy/pipelines/files.py E116 E501
- scrapy/pipelines/images.py E501
- scrapy/pipelines/media.py E501
+ scrapy/pipelines/files.py E116
- scrapy/pipelines/media.py E125
# scrapy/selector
scrapy/selector/__init__.py F403
- scrapy/selector/unified.py E501 E111
+ scrapy/selector/unified.py E111
# scrapy/settings
- scrapy/settings/__init__.py E501
- scrapy/settings/default_settings.py E501 E114 E116
- scrapy/settings/deprecated.py E501
+ scrapy/settings/default_settings.py E114 E116
# scrapy/spidermiddlewares
- scrapy/spidermiddlewares/referer.py E129 W504
- scrapy/spidermiddlewares/httperror.py E501
- scrapy/spidermiddlewares/offsite.py E501
- scrapy/spidermiddlewares/referer.py E501 E129
- scrapy/spidermiddlewares/urllength.py E501
++ scrapy/spidermiddlewares/referer.py E129
# scrapy/spiders
- scrapy/spiders/__init__.py E501 E402
- scrapy/spiders/crawl.py E501
- scrapy/spiders/feed.py E501
- scrapy/spiders/sitemap.py E501
+ scrapy/spiders/__init__.py E402
# scrapy/utils
- scrapy/utils/asyncio.py E501
- scrapy/utils/benchserver.py E501
- scrapy/utils/conf.py E402 E501
- scrapy/utils/datatypes.py E501
- scrapy/utils/decorators.py E501
- scrapy/utils/defer.py E501 E128
- scrapy/utils/deprecate.py E501
- scrapy/utils/gz.py E501
+ scrapy/utils/conf.py E402
+ scrapy/utils/defer.py E128
- scrapy/utils/deprecate.py E128 E127
- scrapy/utils/gz.py W504
scrapy/utils/http.py F403
- scrapy/utils/httpobj.py E501
- scrapy/utils/iterators.py E501
- scrapy/utils/log.py E128 E501
+ scrapy/utils/log.py E128
scrapy/utils/markup.py F403
- scrapy/utils/misc.py E501
scrapy/utils/multipart.py F403
- scrapy/utils/request.py E127
- scrapy/utils/project.py E501
- scrapy/utils/python.py E501
- scrapy/utils/reactor.py E501
- scrapy/utils/reqser.py E501
- scrapy/utils/request.py E501
- scrapy/utils/response.py E501 E128
- scrapy/utils/signal.py E501 E128
- scrapy/utils/sitemap.py E501
- scrapy/utils/spider.py E501
- scrapy/utils/ssl.py E501
- scrapy/utils/test.py E501
- scrapy/utils/url.py E501 F403 E128 F405
+ scrapy/utils/response.py E128
+ scrapy/utils/signal.py E128
+ scrapy/utils/url.py F403 E128 F405
# scrapy
- scrapy/__init__.py E402 E501
- scrapy/cmdline.py E501
- scrapy/crawler.py E501
- scrapy/dupefilters.py E501
- scrapy/exceptions.py E501
- scrapy/exporters.py E501
- scrapy/interfaces.py E501
- scrapy/item.py E501 E128
- scrapy/link.py E501
- scrapy/logformatter.py E501
- scrapy/mail.py E402 E128 E501
- scrapy/middleware.py E128 E501
- scrapy/pqueues.py E501
- scrapy/resolver.py E501
- scrapy/responsetypes.py E128 E501
- scrapy/robotstxt.py E501
- scrapy/shell.py E501
- scrapy/signalmanager.py E501
- scrapy/spiderloader.py F841 E501 E126
+ scrapy/__init__.py E402
+ scrapy/item.py E128
+ scrapy/mail.py E402 E128
+ scrapy/middleware.py E128
+ scrapy/responsetypes.py E128
+ scrapy/spiderloader.py F841 E126
scrapy/squeues.py E128
- scrapy/statscollectors.py E501
# tests
- tests/__init__.py E402 E501
- tests/mockserver.py E501 E126
+ tests/__init__.py E402
- tests/mockserver.py E401 E126 E123
++ tests/mockserver.py E126
tests/pipelines.py F841
- tests/spiders.py E127
- tests/test_closespider.py E127
- tests/spiders.py E501
- tests/test_closespider.py E501
- tests/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_crawl.py E501 E741
- tests/test_crawler.py F841 E501
- tests/test_dependencies.py F841 E501
- tests/test_downloader_handlers.py E124 E128 E501 E126
- tests/test_downloadermiddleware.py E501
- tests/test_downloadermiddleware_ajaxcrawlable.py E501
- tests/test_downloadermiddleware_cookies.py E741 E501 E128 E126
- tests/test_downloadermiddleware_defaultheaders.py E501
- tests/test_downloadermiddleware_downloadtimeout.py E501
- tests/test_downloadermiddleware_httpcache.py E501
- tests/test_downloadermiddleware_httpcompression.py E501 E126
- tests/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 E126
- tests/test_downloadermiddleware_robotstxt.py E501
- tests/test_downloadermiddleware_stats.py E501
- tests/test_dupefilters.py E501 E741 E128 E124
- tests/test_engine.py E501 E128
- tests/test_exporters.py E501 E128 E124
+ tests/test_command_parse.py E128
+ tests/test_command_shell.py E128
+ tests/test_commands.py E128
+ tests/test_contracts.py E128
+ tests/test_crawl.py E741
+ tests/test_crawler.py F841
+ tests/test_dependencies.py F841
- tests/test_downloader_handlers.py E124 E127 E128 E126 E123
++ tests/test_downloader_handlers.py E124 E128 E126
+ tests/test_downloadermiddleware_cookies.py E741 E128 E126
- tests/test_downloadermiddleware_decompression.py E127
- tests/test_downloadermiddleware_httpcompression.py E126 E123
++ tests/test_downloadermiddleware_httpcompression.py E126
+ tests/test_downloadermiddleware_httpproxy.py E128
- tests/test_downloadermiddleware_redirect.py E128 E127
++ tests/test_downloadermiddleware_redirect.py E128
+ tests/test_downloadermiddleware_retry.py E128 E126
+ tests/test_dupefilters.py E741 E128 E124
- tests/test_engine.py E401 E128
++ tests/test_engine.py E128
+ tests/test_exporters.py E128 E124
tests/test_extension_telnet.py F841
- tests/test_feedexport.py E501 F841
- tests/test_http_cookies.py E501
- tests/test_http_headers.py E501
- tests/test_http_request.py E402 E501 E128 E128 E126
- tests/test_http_response.py E501 E128
+ tests/test_feedexport.py F841
- tests/test_http_request.py E402 E127 E128 E128 E126 E123
++ tests/test_http_request.py E402 E128 E128 E126
+ tests/test_http_response.py E128
tests/test_item.py E128 F841
- tests/test_link.py E501
- tests/test_linkextractors.py E501 E128 E124
- tests/test_loader.py E501 E741 E128 E117
- tests/test_logformatter.py E128 E501 E122
- tests/test_mail.py E128 E501
- tests/test_middleware.py E501 E128
- 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
- tests/test_proxy_connect.py E501 E741
- tests/test_request_cb_kwargs.py E501
- tests/test_responsetypes.py E501
- tests/test_robotstxt_interface.py E501 E501
- tests/test_scheduler.py E501 E126
- tests/test_selector.py E501
- tests/test_spider.py E501
- tests/test_spidermiddleware.py E501
- tests/test_spidermiddleware_httperror.py E128 E501 E121
- tests/test_spidermiddleware_offsite.py E501 E128 E111
- tests/test_spidermiddleware_output_chain.py E501
- tests/test_spidermiddleware_referer.py E501 F841 E124 E501 E121
- tests/test_squeues.py E501 E741
- tests/test_utils_asyncio.py E501
- tests/test_utils_conf.py E501 E128
- tests/test_utils_curl.py E501
- tests/test_utils_datatypes.py E402 E501
- tests/test_utils_defer.py E501 F841
- tests/test_utils_deprecate.py F841 E501
- tests/test_utils_http.py E501 E128
- tests/test_utils_iterators.py E501 E128 E129
+ tests/test_linkextractors.py E128 E124
+ tests/test_loader.py E741 E128 E117
+ tests/test_logformatter.py E128 E122
+ tests/test_mail.py E128
+ tests/test_middleware.py E128
+ tests/test_pipeline_crawl.py E128 E126
+ tests/test_pipeline_images.py F841
+ tests/test_pipeline_media.py E741 E128
+ tests/test_proxy_connect.py E741
- tests/test_scheduler.py E126 E123
- tests/test_selector.py E127
- tests/test_spidermiddleware_httperror.py E128 E127 E121
++ tests/test_scheduler.py E126
++ tests/test_spidermiddleware_httperror.py E128 E121
+ tests/test_spidermiddleware_offsite.py E128 E111
- tests/test_spidermiddleware_referer.py F841 E125 E124 E121
++ tests/test_spidermiddleware_referer.py F841 E124 E121
+ tests/test_squeues.py E741
+ tests/test_utils_conf.py E128
+ tests/test_utils_datatypes.py E402
+ tests/test_utils_defer.py F841
+ tests/test_utils_deprecate.py F841
- tests/test_utils_http.py E128 W504
++ tests/test_utils_http.py E128
+ tests/test_utils_iterators.py E128 E129
tests/test_utils_log.py E741
- tests/test_utils_python.py E501
- tests/test_utils_reqser.py E501 E128
- tests/test_utils_request.py E501 E128
- tests/test_utils_response.py E501
+ tests/test_utils_reqser.py E128
+ tests/test_utils_request.py E128
tests/test_utils_signal.py E741 F841
- tests/test_utils_sitemap.py E128 E501 E124
- tests/test_utils_url.py E501 E501 E126
- tests/test_webclient.py E501 E128 E122 E402 E126
- tests/test_cmdline/__init__.py E501
- tests/test_settings/__init__.py E501 E128
- tests/test_spiderloader/__init__.py E128 E501
- tests/test_utils_misc/__init__.py E501
+ tests/test_utils_sitemap.py E128 E124
- tests/test_utils_url.py E127 E125 E126 E123
- tests/test_webclient.py E128 E122 E402 E123 E126
++ tests/test_utils_url.py E126
++ tests/test_webclient.py E128 E122 E402 E126
+ tests/test_settings/__init__.py E128
+ tests/test_spiderloader/__init__.py E128
diff --cc tests/test_utils_iterators.py
index 38630d012,a85087619..2c3da3c05
--- a/tests/test_utils_iterators.py
+++ b/tests/test_utils_iterators.py
@@@ -167,15 -157,10 +167,15 @@@ class XmliterTestCase(unittest.TestCase
def test_xmliter_objtype_exception(self):
i = self.xmliter(42, 'product')
- self.assertRaises(AssertionError, next, i)
+ self.assertRaises(TypeError, next, i)
def test_xmliter_encoding(self):
- body = b'<?xml version="1.0" encoding="ISO-8859-9"?>\n<xml>\n <item>Some Turkish Characters \xd6\xc7\xde\xdd\xd0\xdc \xfc\xf0\xfd\xfe\xe7\xf6</item>\n</xml>\n\n'
+ body = (
+ b'<?xml version="1.0" encoding="ISO-8859-9"?>\n'
+ b'<xml>\n'
+ b' <item>Some Turkish Characters \xd6\xc7\xde\xdd\xd0\xdc \xfc\xf0\xfd\xfe\xe7\xf6</item>\n'
+ b'</xml>\n\n'
+ )
response = XmlResponse('http://www.example.com', body=body)
self.assertEqual(
next(self.xmliter(response, 'item')).get(),