Index: base.py
===================================================================
RCS file: /cvs/Twisted/twisted/internet/base.py,v
retrieving revision 1.27
diff -u -r1.27 base.py
--- base.py	30 Oct 2002 05:56:34 -0000	1.27
+++ base.py	23 Nov 2002 03:42:03 -0000
@@ -21,8 +21,6 @@
 Maintainer: U{Itamar Shtull-Trauring<mailto:twisted@itamarst.org>}
 """
 
-import socket # needed only for sync-dns
-
 import warnings
 from time import time
 from bisect import insort
@@ -135,22 +133,13 @@
     def removeAll(self):
         raise NotImplementedError
 
-    def resolve(self, name, type=1, timeout=10):
+    def resolve(self, name, timeout=10):
         """Return a Deferred that will resolve a hostname.
         """
-        # XXX TODO: alternative resolver implementations
-        from twisted.internet.defer import Deferred
-        deferred = Deferred()
-        if type == 1:
-            try:
-                address = socket.gethostbyname(name)
-            except socket.error:
-                deferred.errback(failure.Failure(error.DNSLookupError("address not found")))
-            else:
-                deferred.callback(address)
-        else:
-            deferred.errback(failure.Failure(ValueError("type not supported")))
-        return deferred
+        from twisted.names import client
+        from twisted.protocols import dns
+        return client.lookupAddress(name).addCallback(lambda m: m[0])
+
 
     # Installation.