summaryrefslogtreecommitdiff
path: root/sleekxmpp
diff options
context:
space:
mode:
authorFlorent Le Coz <louiz@louiz.org>2010-11-08 09:14:17 +0800
committerLance Stout <lancestout@gmail.com>2010-11-09 01:53:41 +0800
commit9dbf246f0bfcac2c4ce538431ee629f126c86447 (patch)
tree9fe3bd976f28f619437a443e2321a1816d2e1072 /sleekxmpp
parent4fb77ac8787422169566d613562127acf75a427b (diff)
downloadslixmpp-9dbf246f0bfcac2c4ce538431ee629f126c86447.tar.gz
slixmpp-9dbf246f0bfcac2c4ce538431ee629f126c86447.tar.bz2
slixmpp-9dbf246f0bfcac2c4ce538431ee629f126c86447.tar.xz
slixmpp-9dbf246f0bfcac2c4ce538431ee629f126c86447.zip
Doesn't fail if host has NO SRV record
Just catch an other exception type coming from the dns resolver that could be raised with hosts like "anon.example.com" which just don't have any SRV record.
Diffstat (limited to 'sleekxmpp')
-rw-r--r--sleekxmpp/basexmpp.py9
-rw-r--r--sleekxmpp/clientxmpp.py2
-rw-r--r--sleekxmpp/componentxmpp.py2
3 files changed, 2 insertions, 11 deletions
diff --git a/sleekxmpp/basexmpp.py b/sleekxmpp/basexmpp.py
index 77191e77..cd7d2510 100644
--- a/sleekxmpp/basexmpp.py
+++ b/sleekxmpp/basexmpp.py
@@ -28,15 +28,6 @@ from sleekxmpp.xmlstream.handler import *
log = logging.getLogger(__name__)
-
-# Flag indicating if DNS SRV records are available for use.
-SRV_SUPPORT = True
-try:
- import dns.resolver
-except:
- SRV_SUPPORT = False
-
-
# In order to make sure that Unicode is handled properly
# in Python 2.x, reset the default encoding.
if sys.version_info < (3, 0):
diff --git a/sleekxmpp/clientxmpp.py b/sleekxmpp/clientxmpp.py
index a88c5ccb..1c600812 100644
--- a/sleekxmpp/clientxmpp.py
+++ b/sleekxmpp/clientxmpp.py
@@ -164,7 +164,7 @@ class ClientXMPP(BaseXMPP):
try:
xmpp_srv = "_xmpp-client._tcp.%s" % self.server
answers = dns.resolver.query(xmpp_srv, dns.rdatatype.SRV)
- except dns.resolver.NXDOMAIN:
+ except (dns.resolver.NXDOMAIN, dns.resolver.NoAnswer):
log.debug("No appropriate SRV record found." + \
" Using JID server name.")
else:
diff --git a/sleekxmpp/componentxmpp.py b/sleekxmpp/componentxmpp.py
index 8b0b6cc0..ae58c5f2 100644
--- a/sleekxmpp/componentxmpp.py
+++ b/sleekxmpp/componentxmpp.py
@@ -15,7 +15,7 @@ import hashlib
from sleekxmpp import plugins
from sleekxmpp import stanza
-from sleekxmpp.basexmpp import BaseXMPP, SRV_SUPPORT
+from sleekxmpp.basexmpp import BaseXMPP
from sleekxmpp.xmlstream import XMLStream, RestartStream
from sleekxmpp.xmlstream import StanzaBase, ET
from sleekxmpp.xmlstream.matcher import *