summaryrefslogtreecommitdiff
path: root/sleekxmpp/xmlstream
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2012-12-29 15:17:34 -0800
committerLance Stout <lancestout@gmail.com>2012-12-29 15:17:34 -0800
commit0998429b07cfc23564847237b5873819a65e531c (patch)
tree41729d029652e925251b0bbc47023062b3e0dcc3 /sleekxmpp/xmlstream
parent9ae3a7dbff6f0828a41b003cf0e9efadc14fc1c7 (diff)
parent597eb1779c497ad850fe3c03fd480fea5c9ef7ea (diff)
downloadslixmpp-0998429b07cfc23564847237b5873819a65e531c.tar.gz
slixmpp-0998429b07cfc23564847237b5873819a65e531c.tar.bz2
slixmpp-0998429b07cfc23564847237b5873819a65e531c.tar.xz
slixmpp-0998429b07cfc23564847237b5873819a65e531c.zip
Merge branch 'master' into develop
Diffstat (limited to 'sleekxmpp/xmlstream')
-rw-r--r--sleekxmpp/xmlstream/resolver.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/sleekxmpp/xmlstream/resolver.py b/sleekxmpp/xmlstream/resolver.py
index 394daa64..16f8a7ad 100644
--- a/sleekxmpp/xmlstream/resolver.py
+++ b/sleekxmpp/xmlstream/resolver.py
@@ -113,7 +113,7 @@ def resolve(host, port=None, service=None, proto='tcp',
if hasattr(socket, 'inet_pton'):
ipv6 = socket.inet_pton(socket.AF_INET6, host)
yield (host, host, port)
- except socket.error:
+ except (socket.error, ValueError):
pass
# If no service was provided, then we can just do A/AAAA lookups on the