copyleftie/gajim-plural
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

better var names and add aprint for stian

Browse source
This commit is contained in:
Nikos Kouremenos 2005-11-06 20:58:22 +00:00
parent a1d8b08d90
commit 7ec7276797
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/common/connection.py
View file

@ -50,15 +50,15 @@ from common import i18n
_ = i18n._ _ = i18n._
# determine which DNS resolution library is available # determine which DNS resolution library is available
HAVE_DNSPYTHON = False HAS_DNSPYTHON = False
HAVE_PYDNS = False HAS_PYDNS = False
try: try:
import dns.resolver # http://dnspython.org/ import dns.resolver # http://dnspython.org/
HAVE_DNSPYTHON = True HAS_DNSPYTHON = True
except ImportError: except ImportError:
try: try:
import DNS # http://pydns.sf.net/ import DNS # http://pydns.sf.net/
HAVE_PYDNS = True HAS_PYDNS = True
except ImportError: except ImportError:
gajim.log.debug("Could not load one of the supported DNS libraries (dnspython or pydns). SRV records will not be queried and you may need to set custom hostname/port for some servers to be accessible.") gajim.log.debug("Could not load one of the supported DNS libraries (dnspython or pydns). SRV records will not be queried and you may need to set custom hostname/port for some servers to be accessible.")
@ -1509,10 +1509,11 @@ class Connection:
hosts = [] hosts = []
# SRV resolver # SRV resolver
if use_srv and (HAVE_DNSPYTHON or HAVE_PYDNS): if use_srv and (HAS_DNSPYTHON or HAS_PYDNS):
query = '_xmpp-client._tcp.' + h query = '_xmpp-client._tcp.' + h
print query
try: try:
if HAVE_DNSPYTHON: if HAS_DNSPYTHON:
answers = [x for x in dns.resolver.query(query, 'SRV')] answers = [x for x in dns.resolver.query(query, 'SRV')]
if answers: if answers:
for a in answers: for a in answers:
@ -1520,7 +1521,7 @@ class Connection:
'port': int(a.port), 'port': int(a.port),
'prio': int(a.priority), 'prio': int(a.priority),
'weight': int(a.weight)}) 'weight': int(a.weight)})
elif HAVE_PYDNS: elif HAS_PYDNS:
# ensure we haven't cached an old configuration # ensure we haven't cached an old configuration
DNS.ParseResolvConf() DNS.ParseResolvConf()
response = DNS.Request().req(query, qtype = 'SRV') response = DNS.Request().req(query, qtype = 'SRV')