Skip to content

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

Spider middleware: simplify deferred errback handling

Eugenio Lacuesta9770ca35fb49
diff --git a/scrapy/core/spidermw.py b/scrapy/core/spidermw.py
index 180a0b1fe..ed02b306b 100644
--- a/scrapy/core/spidermw.py
+++ b/scrapy/core/spidermw.py
@@ -117,14 +117,12 @@ class SpiderMiddlewareManager(MiddlewareManager):
return MutableChain(result, recovered)
def process_callback_output(result):
- if isinstance(result, Failure):
- return process_spider_exception(result)
recovered = MutableChain()
result = _evaluate_iterable(result, 0, recovered)
return MutableChain(process_spider_output(result), recovered)
dfd = mustbe_deferred(process_spider_input, response)
- dfd.addCallbacks(callback=process_callback_output, errback=process_callback_output)
+ dfd.addCallbacks(callback=process_callback_output, errback=process_spider_exception)
return dfd
def process_start_requests(self, start_requests, spider):