Changeset 1859:182c9a1c0182

Timestamp:

11/21/09 15:06:03 (8 months ago)

Author:

Pablo Hoffman <pablo@…>

Branch:

default

Message:

Renamed exception: DontCloseDomain? to DontCloseSpider? (closes #120)

Location:

scrapy

Files:

• contrib/delayedclosedomain.py (modified) (2 diffs)
• core/engine.py (modified) (3 diffs)
• core/exceptions.py (modified) (1 diff)

scrapy/contrib/delayedclosedomain.py

@@ -11 +11 @@
 from scrapy.core import signals
 from scrapy.core.engine import scrapyengine
-from scrapy.core.exceptions import NotConfigured, DontCloseDomain
+from scrapy.core.exceptions import NotConfigured, DontCloseSpider
 from scrapy.conf import settings
 
@@ -34 +34 @@
 
         if time() < lastseen + self.delay:
-            raise DontCloseDomain
+            raise DontCloseSpider
 
     def spider_closed(self, spider):

scrapy/core/engine.py

@@ -17 +17 @@
 from scrapy.core.downloader import Downloader
 from scrapy.core.scraper import Scraper
-from scrapy.core.exceptions import IgnoreRequest, DontCloseDomain
+from scrapy.core.exceptions import IgnoreRequest, DontCloseSpider
 from scrapy.http import Response, Request
 from scrapy.spider import spiders
@@ -252 +252 @@
         """Called when a spider gets idle. This function is called when there
         are no remaining pages to download or schedule. It can be called
-        multiple times. If some extension raises a DontCloseDomain exception
+        multiple times. If some extension raises a DontCloseSpider exception
         (in the spider_idle signal handler) the spider is not closed until the
         next loop and this function is guaranteed to be called (at least) once
@@ -260 +260 @@
             dispatcher.send(signal=signals.spider_idle, sender=self.__class__, \
                 spider=spider)
-        except DontCloseDomain:
+        except DontCloseSpider:
             reactor.callLater(5, self.next_request, spider)
             return
-        except:
-            log.err("Exception catched on spider_idle signal dispatch")
+        except Exception, e:
+            log.msg("Exception caught on 'spider_idle' signal dispatch: %r" % e, \
+                level=log.ERROR)
         if self.spider_is_idle(spider):
             self.close_spider(spider, reason='finished')

scrapy/core/exceptions.py

@@ -26 +26 @@
         return self.msg
 
-class DontCloseDomain(Exception):
-    """Request the domain not to be closed yet"""
+class DontCloseSpider(Exception):
+    """Request the spider not to be closed yet"""
     pass