From 60e7b80798f8ce4a09c1909db4c6e58877d79f68 Mon Sep 17 00:00:00 2001 From: Pablo Hoffman Date: Thu, 9 Jul 2009 12:57:10 -0300 Subject: [PATCH] removed signal docs from core.signals module, to leave them only in once place (the doc) --- docs/ref/signals.rst | 4 ++-- scrapy/core/scraper.py | 8 ++++---- scrapy/core/signals.py | 39 --------------------------------------- 3 files changed, 6 insertions(+), 45 deletions(-) diff --git a/docs/ref/signals.rst b/docs/ref/signals.rst index b60936396..97d8a71bc 100644 --- a/docs/ref/signals.rst +++ b/docs/ref/signals.rst @@ -136,8 +136,8 @@ order. .. signal:: item_dropped .. function:: item_dropped(item, spider, response, exception) - Sent after an item has dropped from the :ref:`topics-item-pipeline` when some stage - raised a :exception:`DropItem` exception. + Sent after an item has been dropped from the :ref:`topics-item-pipeline` + when some stage raised a :exception:`DropItem` exception. :param item: the item dropped from the :ref:`topics-item-pipeline` :type item: :class:`~scrapy.item.ScrapedItem` object diff --git a/scrapy/core/scraper.py b/scrapy/core/scraper.py index a84bcb7b8..f6a65c439 100644 --- a/scrapy/core/scraper.py +++ b/scrapy/core/scraper.py @@ -188,12 +188,12 @@ class Scraper(object): ex = output.value if isinstance(ex, DropItem): log.msg("Dropped %s - %s" % (item, str(ex)), log.DEBUG, domain=domain) - signals.send_catch_log(signal=signals.item_dropped, \ - sender=self.__class__, item=item, spider=spider, exception=output.value) + signals.send_catch_log(signal=signals.item_dropped, sender=self.__class__, \ + item=item, spider=spider, response=response, exception=output.value) else: log.msg('Error processing %s - %s' % (item, output), \ log.ERROR, domain=domain) else: - signals.send_catch_log(signal=signals.item_passed, \ - sender=self.__class__, item=item, spider=spider, output=output) + signals.send_catch_log(signal=signals.item_passed, sender=self.__class__, \ + item=item, spider=spider, response=response, output=output) diff --git a/scrapy/core/signals.py b/scrapy/core/signals.py index 341c07fa3..4d21ae37a 100644 --- a/scrapy/core/signals.py +++ b/scrapy/core/signals.py @@ -9,57 +9,18 @@ from pydispatch import dispatcher from scrapy import log -# After the execution engine has started -# args: None engine_started = object() - -# After the execution engine has stopped -# args: None engine_stopped = object() - -# Before opening a new domain for crawling -# args: domain, spider domain_open = object() - -# After a domain has been opened for crawling -# args: domain, spider domain_opened = object() - -# When a domain has no remaining requests to process -# args: domain, spider domain_idle = object() - -# After a domain has been closed -# args: domain, spider, reason domain_closed = object() - -# New request received from spiders -# args: request, spider, response -# response is the response (fed to the spider) which generated the request request_received = object() - -# When request is sent in the downloader -# args: request, spider request_uploaded = object() - -# When new response is received (by the engine) from the downloader (middleware) -# args: response, spider response_received = object() - -# When response arrives from the downloader -# args: response, spider response_downloaded = object() - -# After item is returned from spiders -# args: item, spider, response item_scraped = object() - -# After item is processed by pipeline and pass all its stages -# args: item, spider, response, pipe_output item_passed = object() - -# After item is dropped by pipeline -# args: item, spider, response, exception item_dropped = object() def send_catch_log(signal, sender=None, **kwargs):