Skip to content

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

Merge remote-tracking branch 'origin/master' into asyncio-parse-asyncgen-proper-rebased

Andrey Rakhmatullin66d8a7192060
diff --cc docs/topics/spider-middleware.rst
index ece819124,73bedf655..c2651debb
--- a/docs/topics/spider-middleware.rst
+++ b/docs/topics/spider-middleware.rst
@@@ -129,8 -122,8 +129,8 @@@ object gives you access, for example, t
method (from a previous spider middleware) raises an exception.
:meth:`process_spider_exception` should return either ``None`` or an
- iterable of :class:`~scrapy.Request` objects and :ref:`item objects
- <topics-items>`.
- iterable of :class:`~scrapy.Request` or :ref:`item <topics-items>`
++ iterable of :class:`~scrapy.Request` or :ref:`item <topics-items>`
+ objects.
If it returns ``None``, Scrapy will continue processing this exception,
executing any other :meth:`process_spider_exception` in the following