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

fix coding standards for dman patch

This commit is contained in:
Nikos Kouremenos 2005-09-05 11:32:59 +00:00
parent 70e965ce7f
commit b661626f14
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/common/xmpp/transports.py
View File

@ -38,11 +38,11 @@ HAVE_PYDNS = False
try: try:
import dns.resolver # http://dnspython.org/ import dns.resolver # http://dnspython.org/
HAVE_DNSPYTHON = True HAVE_DNSPYTHON = True
except ImportError : except ImportError:
try : try:
import DNS # http://pydns.sf.net/ import DNS # http://pydns.sf.net/
HAVE_PYDNS = True HAVE_PYDNS = True
except ImportError : except ImportError:
#TODO: use self.DEBUG() #TODO: use self.DEBUG()
print "Couldn't load a supported DNS library. SRV records will not be queried and some servers may not be accessible." print "Couldn't load a supported DNS library. SRV records will not be queried and some servers may not be accessible."
@ -69,23 +69,23 @@ class TCPsocket(PlugIn):
self._exported_methods=[self.send,self.disconnect] self._exported_methods=[self.send,self.disconnect]
# SRV resolver # SRV resolver
if HAVE_DNSPYTHON or HAVE_PYDNS : if HAVE_DNSPYTHON or HAVE_PYDNS:
host, port = server host, port = server
possible_queries = ['_xmpp-client._tcp.' + host] possible_queries = ['_xmpp-client._tcp.' + host]
for query in possible_queries: for query in possible_queries:
try: try:
if HAVE_DNSPYTHON : if HAVE_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:
host = str (answers[0].target) host = str (answers[0].target)
port = int (answers[0].port) port = int (answers[0].port)
break break
elif HAVE_PYDNS : elif HAVE_PYDNS:
DNS.ParseResolvConf() # ensure we haven't cached an old configuration DNS.ParseResolvConf() # ensure we haven't cached an old configuration
response = DNS.Request().req(query, qtype='SRV') response = DNS.Request().req(query, qtype='SRV')
answers = response.answers answers = response.answers
if len(answers) > 0 : if len(answers) > 0:
_, _, port, host = answers[0]['data'] # ignore the priority and weight for now _, _, port, host = answers[0]['data'] # ignore the priority and weight for now
port = int(port) port = int(port)
break break