From 58a419f45ccd1114ba9bc8036e7b5daf5beeede3 Mon Sep 17 00:00:00 2001
From: olveyra <none@none>
Date: Thu, 2 Oct 2008 19:59:51 +0000
Subject: [PATCH] added support for global DOWNLOAD_DELAY setting

--HG--
extra : convert_revision : svn%3Ab85faa78-f9eb-468e-a121-7cced6da292c%40291
---
 scrapy/trunk/scrapy/core/downloader/manager.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scrapy/trunk/scrapy/core/downloader/manager.py b/scrapy/trunk/scrapy/core/downloader/manager.py
index 1f24ba4ac..ce8130687 100644
--- a/scrapy/trunk/scrapy/core/downloader/manager.py
+++ b/scrapy/trunk/scrapy/core/downloader/manager.py
@@ -139,7 +139,7 @@ class Downloader(object):
             return
 
         # Instanciate site specific handling based on info provided by spider
-        delay = getattr(spider, 'download_delay', None)
+        delay = getattr(spider, 'download_delay', None) or settings.getint("DOWNLOAD_DELAY", 0)
         maxcr = getattr(spider, 'max_concurrent_requests', settings.getint('REQUESTS_PER_DOMAIN'))
         site = SiteDetails(download_delay=delay, max_concurrent_requests=maxcr)
         self.sites[domain] = site