Merge branch 'master' into develop

2012-12-21 13:44:08 -08:00 · 2012-12-21 13:44:08 -08:00 · 9ae3a7dbff
commit 9ae3a7dbff
parent 29c049612a 3519e845a3
1 changed files with 1 additions and 1 deletions
--- 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: