Changeset 1848:8a8cce84d4c2

Timestamp:

11/13/09 20:04:39 (10 months ago)

Author:

Pablo Hoffman <pablo@…>

Parents:

1847:090ae224595c (diff), 1846:bbd7752e74f9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Branch:

default

Message:

Automated merge with http://hg.scrapy.org/scrapy-stable/

Files:

• docs/topics/signals.rst (modified) (2 diffs)
• docs/topics/signals.rst (modified) (3 diffs)
• scrapy/contrib/closedomain.py (deleted)
• scrapy/core/downloader/handlers.py (deleted)
• scrapy/xpath/__init__.py (deleted)
• scrapy/xpath/selector.py (deleted)

docs/topics/signals.rst

@@ -166 +166 @@
 
 .. signal:: request_received
-.. function:: request_received(request, spider, response)
+.. function:: request_received(request, spider)
 
     Sent when the engine receives a :class:`~scrapy.http.Request` from a spider.
@@ -176 +176 @@
     :type spider: :class:`~scrapy.spider.BaseSpider` object
 
-    :param response: the :class:`~scrapy.http.Response` fed to the spider which
-        generated the request later
-    :type response: :class:`~scrapy.http.Response` object
-
 request_uploaded
 ----------------

docs/topics/signals.rst

@@ -30 +30 @@
 order.
 
-domain_closed
+spider_closed
 -------------
 
-.. signal:: domain_closed
-.. function:: domain_closed(domain, spider, reason)
-
-    Sent after a spider/domain has been closed. This can be used to release
-    per-spider resources reserved on :signal:`domain_opened`.
-
-    :param domain: a string which contains the domain of the spider which has
-        been closed
-    :type domain: str
+.. signal:: spider_closed
+.. function:: spider_closed(spider, reason)
+
+    Sent after a spider has been closed. This can be used to release per-spider
+    resources reserved on :signal:`spider_opened`.
 
     :param spider: the spider which has been closed
     :type spider: :class:`~scrapy.spider.BaseSpider` object
 
-    :param reason: a string which describes the reason why the domain was closed. If
-        it was closed because the domain has completed scraping, it the reason
-        is ``'finished'``. Otherwise, if the domain was manually closed by
-        calling the ``close_domain`` engine method, then the reason is the one
+    :param reason: a string which describes the reason why the spider was closed. If
+        it was closed because the spider has completed scraping, it the reason
+        is ``'finished'``. Otherwise, if the spider was manually closed by
+        calling the ``close_spider`` engine method, then the reason is the one
         passed in the ``reason`` argument of that method (which defaults to
         ``'cancelled'``). If the engine was shutdown (for example, by hitting
@@ -55 +51 @@
     :type reason: str
 
-domain_opened
+spider_opened
 -------------
 
-.. signal:: domain_opened
-.. function:: domain_opened(domain, spider)
-
-    Sent after a spider/domain has been opened for crawling. This is typically
-    used to reserve per-spider resources, but can be used for any task that
-    needs to be performed when a spider/domain is opened.
-
-    :param domain: a string with the domain of the spider which has been opened
-    :type domain: str
+.. signal:: spider_opened
+.. function:: spider_opened(spider)
+
+    Sent after a spider has been opened for crawling. This is typically used to
+    reserve per-spider resources, but can be used for any task that needs to be
+    performed when a spider is opened.
 
     :param spider: the spider which has been opened
     :type spider: :class:`~scrapy.spider.BaseSpider` object
 
-domain_idle
+spider_idle
 -----------
 
-.. signal:: domain_idle
-.. function:: domain_idle(domain, spider)
-
-    Sent when a domain has gone idle, which means the spider has no further:
+.. signal:: spider_idle
+.. function:: spider_idle(spider)
+
+    Sent when a spider has gone idle, which means the spider has no further:
 
         * requests waiting to be downloaded
@@ -84 +77 @@
 
     If the idle state persists after all handlers of this signal have finished,
-    the engine starts closing the domain. After the domain has finished
-    closing, the :signal:`domain_closed` signal is sent.
-
-    You can, for example, schedule some requests in your :signal:`domain_idle`
-    handler to prevent the domain from being closed.
-
-    :param domain: is a string with the domain of the spider which has gone idle
-    :type domain: str
+    the engine starts closing the spider. After the spider has finished
+    closing, the :signal:`spider_closed` signal is sent.
+
+    You can, for example, schedule some requests in your :signal:`spider_idle`
+    handler to prevent the spider from being closed.
 
     :param spider: the spider which has gone idle