From 314bbabb30dc70298e59c2979ec0a9311ece5baa Mon Sep 17 00:00:00 2001 From: Pablo Hoffman Date: Sun, 18 Jan 2009 16:55:54 +0000 Subject: [PATCH] removed 'domain' from Request attributes and constructor arguments --HG-- extra : convert_revision : svn%3Ab85faa78-f9eb-468e-a121-7cced6da292c%40744 --- scrapy/trunk/scrapy/core/manager.py | 5 +---- scrapy/trunk/scrapy/http/request.py | 4 +--- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/scrapy/trunk/scrapy/core/manager.py b/scrapy/trunk/scrapy/core/manager.py index 821405aaa..a699c5346 100644 --- a/scrapy/trunk/scrapy/core/manager.py +++ b/scrapy/trunk/scrapy/core/manager.py @@ -129,10 +129,7 @@ class ExecutionManager(object): # requests for request in requests: - if request.domain: - spider = spiders.fromdomain(request.domain) - else: - spider = spiders.fromurl(request.url) + spider = spiders.fromurl(request.url) if not spider: log.msg('Could not find spider for %s' % request, log.ERROR) continue diff --git a/scrapy/trunk/scrapy/http/request.py b/scrapy/trunk/scrapy/http/request.py index ff5e21c8f..876d056fa 100644 --- a/scrapy/trunk/scrapy/http/request.py +++ b/scrapy/trunk/scrapy/http/request.py @@ -19,7 +19,7 @@ class Request(object): def __init__(self, url, callback=None, method='GET', body=None, headers=None, cookies=None, meta=None, - url_encoding='utf-8', dont_filter=None, domain=None): + url_encoding='utf-8', dont_filter=None): self.encoding = url_encoding # this one has to be set first self.set_url(url) @@ -42,8 +42,6 @@ class Request(object): self.headers = Headers(headers or {}, encoding=url_encoding) # dont_filter be filtered by scheduler self.dont_filter = dont_filter - #allows to directly specify the spider for the request - self.domain = domain self.meta = {} if meta is None else dict(meta) self.cache = {}