summaryrefslogtreecommitdiff
path: root/sleekxmpp/jid.py
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2012-12-21 13:44:08 -0800
committerLance Stout <lancestout@gmail.com>2012-12-21 13:44:08 -0800
commit9ae3a7dbff6f0828a41b003cf0e9efadc14fc1c7 (patch)
tree1eea45604baf3897e2f4139b8871ac59e595cd53 /sleekxmpp/jid.py
parent29c049612a181e480371f3a686170a87af1e9f98 (diff)
parent3519e845a35d6ac1fdd07091b99f02a8a391147a (diff)
downloadslixmpp-9ae3a7dbff6f0828a41b003cf0e9efadc14fc1c7.tar.gz
slixmpp-9ae3a7dbff6f0828a41b003cf0e9efadc14fc1c7.tar.bz2
slixmpp-9ae3a7dbff6f0828a41b003cf0e9efadc14fc1c7.tar.xz
slixmpp-9ae3a7dbff6f0828a41b003cf0e9efadc14fc1c7.zip
Merge branch 'master' into develop
Diffstat (limited to 'sleekxmpp/jid.py')
-rw-r--r--sleekxmpp/jid.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/sleekxmpp/jid.py b/sleekxmpp/jid.py
index bf0c1970..752c3210 100644
--- a/sleekxmpp/jid.py
+++ b/sleekxmpp/jid.py
@@ -202,7 +202,7 @@ def _validate_domain(domain):
socket.inet_pton(socket.AF_INET6, domain.strip('[]'))
domain = '[%s]' % domain.strip('[]')
ip_addr = True
- except socket.error:
+ except (socket.error, ValueError):
pass
if not ip_addr: