summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2011-08-18 00:47:07 -0700
committerLance Stout <lancestout@gmail.com>2011-08-18 00:47:07 -0700
commitcd7cd30b4c5c46c4912db2970993bcd5160a36eb (patch)
treee25368a1eb208520050e9e03c18ac4763c2ef3b1
parent4ea22ff69bac4b619b1eeb918c67a209f6e953ee (diff)
downloadslixmpp-cd7cd30b4c5c46c4912db2970993bcd5160a36eb.tar.gz
slixmpp-cd7cd30b4c5c46c4912db2970993bcd5160a36eb.tar.bz2
slixmpp-cd7cd30b4c5c46c4912db2970993bcd5160a36eb.tar.xz
slixmpp-cd7cd30b4c5c46c4912db2970993bcd5160a36eb.zip
Fix exceptions for Python3
-rw-r--r--sleekxmpp/clientxmpp.py2
-rw-r--r--sleekxmpp/xmlstream/xmlstream.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/sleekxmpp/clientxmpp.py b/sleekxmpp/clientxmpp.py
index f7bf8f89..3536e8e9 100644
--- a/sleekxmpp/clientxmpp.py
+++ b/sleekxmpp/clientxmpp.py
@@ -145,7 +145,7 @@ class ClientXMPP(BaseXMPP):
if DNSPYTHON:
try:
answers = [((answer.target.to_text()[:-1], answer.port), answer.priority, answer.weight) for answer in dns.resolver.query("_xmpp-client._tcp.%s" % domain, dns.rdatatype.SRV)]
- except dns.resolver.NXDOMAIN, dns.resolver.NoAnswer:
+ except (dns.resolver.NXDOMAIN, dns.resolver.NoAnswer):
log.warning("No SRV records for %s" % domain)
answers = super(ClientXMPP, self).get_dns_records(domain, port)
except dns.exception.Timeout:
diff --git a/sleekxmpp/xmlstream/xmlstream.py b/sleekxmpp/xmlstream/xmlstream.py
index b090beae..6c2c5aa5 100644
--- a/sleekxmpp/xmlstream/xmlstream.py
+++ b/sleekxmpp/xmlstream/xmlstream.py
@@ -662,7 +662,7 @@ class XMLStream(object):
if DNSPYTHON:
try:
answers = dns.resolver.query(domain, dns.rdatatype.A)
- except dns.resolver.NXDOMAIN, dns.resolver.NoAnswer:
+ except (dns.resolver.NXDOMAIN, dns.resolver.NoAnswer):
log.warning("No A records for %s" % domain)
except dns.exception.Timeout:
log.warning("DNS resolution timed out for A record of %s" % domain)