From 067ec65d97c3f1af84240a04652bfb30337f953a Mon Sep 17 00:00:00 2001 From: Pablo Hoffman Date: Sun, 5 Sep 2010 19:09:42 -0300 Subject: [PATCH] Removed download_any singleton --- scrapy/core/downloader/handlers/__init__.py | 3 --- scrapy/core/downloader/manager.py | 5 +++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/scrapy/core/downloader/handlers/__init__.py b/scrapy/core/downloader/handlers/__init__.py index c89b943a2..1a0c9de0d 100644 --- a/scrapy/core/downloader/handlers/__init__.py +++ b/scrapy/core/downloader/handlers/__init__.py @@ -31,6 +31,3 @@ class RequestHandlers(object): 'no handler available for that scheme') raise NotSupported("Unsupported URL scheme '%s': %s" % (scheme, msg)) return handler(request, spider) - - -download_any = RequestHandlers().download_request diff --git a/scrapy/core/downloader/manager.py b/scrapy/core/downloader/manager.py index 3f754597d..3738ecbc1 100644 --- a/scrapy/core/downloader/manager.py +++ b/scrapy/core/downloader/manager.py @@ -13,7 +13,7 @@ from scrapy.conf import settings from scrapy.utils.defer import mustbe_deferred from scrapy import log from .middleware import DownloaderMiddlewareManager -from .handlers import download_any +from .handlers import RequestHandlers class SpiderInfo(object): @@ -71,6 +71,7 @@ class Downloader(object): def __init__(self): self.sites = {} + self.handlers = RequestHandlers() self.middleware = DownloaderMiddlewareManager() self.concurrent_spiders = settings.getint('CONCURRENT_SPIDERS') @@ -145,7 +146,7 @@ class Downloader(object): # The order is very important for the following deferreds. Do not change! # 1. Create the download deferred - dfd = mustbe_deferred(download_any, request, spider) + dfd = mustbe_deferred(self.handlers.download_request, request, spider) # 2. After response arrives, remove the request from transferring # state to free up the transferring slot so it can be used by the