From 87fbc9c58c6877c1e600354dd898e0014e6ef687 Mon Sep 17 00:00:00 2001 From: Daniel Grana Date: Thu, 28 May 2009 21:47:41 -0300 Subject: [PATCH] spidermw: add domain name to warning about missing callbacks in requests --- scrapy/spider/middleware.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scrapy/spider/middleware.py b/scrapy/spider/middleware.py index 913c9a065..85af03c2a 100644 --- a/scrapy/spider/middleware.py +++ b/scrapy/spider/middleware.py @@ -81,7 +81,7 @@ class SpiderMiddlewareManager(object): 'Middleware %s must returns an iterable object, got %s ' % \ (fname(method), type(result)) - return self._validate_output(request, result) + return self._validate_output(request, result, spider) dfd = mustbe_deferred(process_spider_input, response) dfd.addErrback(process_spider_exception) @@ -93,14 +93,14 @@ class SpiderMiddlewareManager(object): request.deferred.addCallback(arg_to_iter) return request.deferred - def _validate_output(self, request, result): + def _validate_output(self, request, result, spider): """Every request returned by spiders must be instanciate with a callback""" for r in result: if isinstance(r, Request) and not r.deferred.callbacks: log.msg('Ignoring %s returned from spider while processing %s: ' \ 'Request has no callback, try adding callback=self.parse ' \ 'argument when instanciating Request objects inside your spiders' \ - % (r, request), level=log.WARNING) + % (r, request), level=log.WARNING, domain=spider.domain_name) continue yield r