Scrapy, a fast high-level web crawling & scraping framework for Python.
Name resolvers: install_on_reactor as instance method
Eugenio Lacuesta3cfa73b8b12d
diff --git a/scrapy/crawler.py b/scrapy/crawler.pyindex 4531c3aac..0cef75a6a 100644--- a/scrapy/crawler.py+++ b/scrapy/crawler.py@@ -21,7 +21,7 @@ from scrapy.utils.log import (log_scrapy_info,LogCounterHandler,)-from scrapy.utils.misc import load_object+from scrapy.utils.misc import create_instance, load_objectfrom scrapy.utils.ossignal import install_shutdown_handlers, signal_names@@ -305,7 +305,8 @@ class CrawlerProcess(CrawlerRunner):d.addBoth(self._stop_reactor)resolver_class = load_object(self.settings["DNS_RESOLVER"])- resolver_class.install_on_reactor(reactor, crawler=self)+ resolver = create_instance(resolver_class, self.settings, self, reactor=reactor)+ resolver.install_on_reactor(reactor)tp = reactor.getThreadPool()tp.adjustPoolsize(maxthreads=self.settings.getint('REACTOR_THREADPOOL_MAXSIZE'))reactor.addSystemEventTrigger('before', 'shutdown', self.stop)diff --git a/scrapy/resolver.py b/scrapy/resolver.pyindex 792563e79..2b97603da 100644--- a/scrapy/resolver.py+++ b/scrapy/resolver.py@@ -4,7 +4,6 @@ from twisted.internet.interfaces import IHostnameResolver, IResolutionReceiver,from zope.interface.declarations import implementer, providerfrom scrapy.utils.datatypes import LocalCache-from scrapy.utils.misc import create_instance# TODO: cache misses@@ -30,10 +29,8 @@ class CachingThreadedResolver(ThreadedResolver):cache_size = 0return cls(reactor, cache_size, crawler.settings.getfloat('DNS_TIMEOUT'))- @classmethod- def install_on_reactor(cls, reactor, crawler):- resolver = create_instance(cls, None, crawler, reactor=reactor)- reactor.installResolver(resolver)+ def install_on_reactor(self, reactor):+ reactor.installResolver(self)def getHostByName(self, name, timeout=None):if name in dnscache:@@ -72,10 +69,8 @@ class CachingHostnameResolver:cache_size = 0return cls(reactor, cache_size)- @classmethod- def install_on_reactor(cls, reactor, crawler):- resolver = create_instance(cls, None, crawler, reactor=reactor)- reactor.installNameResolver(resolver)+ def install_on_reactor(self, reactor):+ reactor.installNameResolver(self)def resolveHostName(self, resolutionReceiver, hostName, portNumber=0,addressTypes=None, transportSemantics='TCP'):