summaryrefslogtreecommitdiff
path: root/sleekxmpp/xmlstream/resolver.py
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2013-07-18 12:59:16 -0700
committerLance Stout <lancestout@gmail.com>2013-07-18 12:59:16 -0700
commitee6c5632ac4b61bb5521a0eee09368a6868c0de9 (patch)
tree510687d91b396b56e1a6a1198055525a29ee1baa /sleekxmpp/xmlstream/resolver.py
parenteb63825dfd3a0435ff5168c7fa6e56ef628ebf11 (diff)
parentcc81a0e8daf1253d390a5bfae1e7157f3f3f8f3e (diff)
downloadslixmpp-ee6c5632ac4b61bb5521a0eee09368a6868c0de9.tar.gz
slixmpp-ee6c5632ac4b61bb5521a0eee09368a6868c0de9.tar.bz2
slixmpp-ee6c5632ac4b61bb5521a0eee09368a6868c0de9.tar.xz
slixmpp-ee6c5632ac4b61bb5521a0eee09368a6868c0de9.zip
Merge pull request #248 from jakebasile/develop
Caught OSError when querying AAAA records.
Diffstat (limited to 'sleekxmpp/xmlstream/resolver.py')
-rw-r--r--sleekxmpp/xmlstream/resolver.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/sleekxmpp/xmlstream/resolver.py b/sleekxmpp/xmlstream/resolver.py
index 16f8a7ad..4cac254c 100644
--- a/sleekxmpp/xmlstream/resolver.py
+++ b/sleekxmpp/xmlstream/resolver.py
@@ -206,7 +206,7 @@ def get_AAAA(host, resolver=None):
recs = socket.getaddrinfo(host, None, socket.AF_INET6,
socket.SOCK_STREAM)
return [rec[4][0] for rec in recs]
- except socket.gaierror:
+ except (OSError, socket.gaierror):
log.debug("DNS: Error retreiving AAAA address " + \
"info for %s." % host)
return []