[Twisted-Python] [PATCH] nasty bug in twisted.names.client.createResolver
ralf at brainbot.com
ralf at brainbot.com
Mon Feb 16 18:05:41 MST 2004
The parameter variable 'hosts' gets overwritten by the import statement
in createResolver. hosts.Resolver constructor is called with a module
instead of a filename.
- Ralf
===================================================================
RCS file: /cvs/Twisted/twisted/names/client.py,v
retrieving revision 1.45
diff -u -r1.45 client.py
--- twisted/names/client.py 4 Feb 2004 19:55:34 -0000 1.45
+++ twisted/names/client.py 17 Feb 2004 01:01:53 -0000
@@ -303,20 +303,20 @@
return p
-def createResolver(servers = None, resolvconf = None, hosts = None):
+def createResolver(servers = None, resolvconf = None, hostsfile = None):
import resolve, cache, hosts, root
if platform.getType() == 'posix':
if resolvconf is None:
resolvconf = '/etc/resolv.conf'
- if hosts is None:
- hosts = '/etc/hosts'
+ if hostsfile is None:
+ hostsfile = '/etc/hosts'
theResolver = Resolver(resolvconf, servers)
- hostResolver = hosts.Resolver(hosts)
+ hostResolver = hosts.Resolver(hostsfile)
else:
- if hosts is None:
- hosts = r'c:\windows\hosts'
+ if hostsfile is None:
+ hostsfile = r'c:\windows\hosts'
bootstrap = ThreadedResolver()
- hostResolver = hosts.Resolver(hosts)
+ hostResolver = hosts.Resolver(hostsfile)
theResolver = root.bootstrap(bootstrap)
L = [hostResolver, cache.CacheResolver(), theResolver]
--
brainbot technologies ag
boppstrasse 64 . 55118 mainz . germany
fon +49 6131 211639-1 . fax +49 6131 211639-2
http://brainbot.com/ mailto:ralf at brainbot.com
More information about the Twisted-Python
mailing list