Merge remote-tracking branch 'upstream/develop' into develop

This commit is contained in:
Jean-Philippe Caruana 2013-07-30 18:02:03 +02:00
commit 88e64dbfae

View file

@ -202,6 +202,9 @@ def get_AAAA(host, resolver=None):
# If not using dnspython, attempt lookup using the OS level
# getaddrinfo() method.
if resolver is None:
if not socket.has_ipv6:
log.debug("Unable to query %s for AAAA records: IPv6 is not supported", host)
return []
try:
recs = socket.getaddrinfo(host, None, socket.AF_INET6,
socket.SOCK_STREAM)