Merge pull request scrapy#954 from kalessin/int-download-timeout

Force to read DOWNLOAD_TIMEOUT as int (for example to pass using environment variable)
DamonGuo · Nov 26, 2014 · c31fb87 · c31fb87
2 parents dedea72 + 7910fa0
commit c31fb87
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/scrapy/contrib/downloadermiddleware/downloadtimeout.py b/scrapy/contrib/downloadermiddleware/downloadtimeout.py
@@ -14,7 +14,7 @@ def __init__(self, timeout=180):
 
     @classmethod
     def from_crawler(cls, crawler):
-        o = cls(crawler.settings['DOWNLOAD_TIMEOUT'])
+        o = cls(crawler.settings.getfloat('DOWNLOAD_TIMEOUT'))
         crawler.signals.connect(o.spider_opened, signal=signals.spider_opened)
         return o
 

diff --git a/tests/test_downloadermiddleware_downloadtimeout.py b/tests/test_downloadermiddleware_downloadtimeout.py
@@ -8,8 +8,8 @@
 
 class DownloadTimeoutMiddlewareTest(unittest.TestCase):
 
-    def get_request_spider_mw(self):
-        crawler = get_crawler(Spider)
+    def get_request_spider_mw(self, settings=None):
+        crawler = get_crawler(Spider, settings)
         spider = crawler._create_spider('foo')
         request = Request('http://scrapytest.org/')
         return request, spider, DownloadTimeoutMiddleware.from_crawler(crawler)
@@ -20,6 +20,12 @@ def test_default_download_timeout(self):
         assert mw.process_request(req, spider) is None
         self.assertEquals(req.meta.get('download_timeout'), 180)
 
+    def test_string_download_timeout(self):
+        req, spider, mw = self.get_request_spider_mw({'DOWNLOAD_TIMEOUT': '20.1'})
+        mw.spider_opened(spider)
+        assert mw.process_request(req, spider) is None
+        self.assertEquals(req.meta.get('download_timeout'), 20.1)
+
     def test_spider_has_download_timeout(self):
         req, spider, mw = self.get_request_spider_mw()
         spider.download_timeout = 2