summaryrefslogtreecommitdiff
path: root/sleekxmpp/xmlstream/xmlstream.py
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2011-08-18 02:46:48 -0700
committerLance Stout <lancestout@gmail.com>2011-08-18 02:46:48 -0700
commit3e51126e18f4943a825b31c34fa11d8c37982332 (patch)
tree632a06c792ecfb1f117387acf69b49a1c3a8261b /sleekxmpp/xmlstream/xmlstream.py
parenta714fa82b25506df4511e956b1b0cf5f67475e53 (diff)
downloadslixmpp-3e51126e18f4943a825b31c34fa11d8c37982332.tar.gz
slixmpp-3e51126e18f4943a825b31c34fa11d8c37982332.tar.bz2
slixmpp-3e51126e18f4943a825b31c34fa11d8c37982332.tar.xz
slixmpp-3e51126e18f4943a825b31c34fa11d8c37982332.zip
PEP8 edits
Diffstat (limited to 'sleekxmpp/xmlstream/xmlstream.py')
-rw-r--r--sleekxmpp/xmlstream/xmlstream.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/sleekxmpp/xmlstream/xmlstream.py b/sleekxmpp/xmlstream/xmlstream.py
index 3b2b2f4c..9fcead8a 100644
--- a/sleekxmpp/xmlstream/xmlstream.py
+++ b/sleekxmpp/xmlstream/xmlstream.py
@@ -338,7 +338,8 @@ class XMLStream(object):
def _connect(self):
self.stop.clear()
if self.default_domain:
- self.address = self.pick_dns_answer(self.default_domain, self.address[1])
+ self.address = self.pick_dns_answer(self.default_domain,
+ self.address[1])
self.socket = self.socket_class(Socket.AF_INET, Socket.SOCK_STREAM)
self.socket.settimeout(None)
@@ -672,11 +673,13 @@ class XMLStream(object):
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)
+ log.warning("DNS resolution timed out " + \
+ "for A record of %s" % domain)
answers = [((answer.address, port), 0, 0) for answer in answers]
return answers
else:
- log.warning("dnspython is not installed -- relying on OS A record resolution")
+ log.warning("dnspython is not installed -- " + \
+ "relying on OS A record resolution")
return [((domain, port), 0, 0)]
def pick_dns_answer(self, domain, port=None):