diff options
| author | Jean-Philippe Caruana <jp@barreverte.fr> | 2013-07-30 18:02:03 +0200 |
|---|---|---|
| committer | Jean-Philippe Caruana <jp@barreverte.fr> | 2013-07-30 18:02:03 +0200 |
| commit | 88e64dbfae71b4518459b7997c0a6e70d2e48e11 (patch) | |
| tree | 1d61902dec91c31fd79dde8c6f48c595f52af2c2 | |
| parent | db0ab9a0b377d33d2975b45f2368ea0197b4ed1c (diff) | |
| parent | afd48b9e08c1b823c48c35c12c25dd3acadc4dcd (diff) | |
| download | slixmpp-88e64dbfae71b4518459b7997c0a6e70d2e48e11.tar.gz slixmpp-88e64dbfae71b4518459b7997c0a6e70d2e48e11.tar.bz2 slixmpp-88e64dbfae71b4518459b7997c0a6e70d2e48e11.tar.xz slixmpp-88e64dbfae71b4518459b7997c0a6e70d2e48e11.zip | |
Merge remote-tracking branch 'upstream/develop' into develop
| -rw-r--r-- | sleekxmpp/xmlstream/resolver.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sleekxmpp/xmlstream/resolver.py b/sleekxmpp/xmlstream/resolver.py index 4cac254c..6f26797f 100644 --- a/sleekxmpp/xmlstream/resolver.py +++ b/sleekxmpp/xmlstream/resolver.py @@ -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) |