catch dns.exception.Timeout if our query times out

Original author: Bob Halley <halley@dnspython.org>
Date: 2004-07-31 09:58:29

diff --git a/dns/resolver.py b/dns/resolver.py
index 49a605f1a2cd9bd428d22d3c7a54ebbe7e8deb75..85fcfb916b1623740e234585217ed5d2e9cb80d2 100644 (file)
--- a/dns/resolver.py
+++ b/dns/resolver.py
@@ -500,7 +500,7 @@ class Resolver(object):
                         else:
                             response = dns.query.udp(request, nameserver,
                                                      timeout, self.port)
-                    except socket.error:
+                    except (socket.error, dns.exception.Timeout):
                         #
                         # Communication failure or timeout.  Go to the
                         # next server