Merge branch 'master' into develop
This commit is contained in:
commit
0998429b07
@ -113,7 +113,7 @@ def resolve(host, port=None, service=None, proto='tcp',
|
|||||||
if hasattr(socket, 'inet_pton'):
|
if hasattr(socket, 'inet_pton'):
|
||||||
ipv6 = socket.inet_pton(socket.AF_INET6, host)
|
ipv6 = socket.inet_pton(socket.AF_INET6, host)
|
||||||
yield (host, host, port)
|
yield (host, host, port)
|
||||||
except socket.error:
|
except (socket.error, ValueError):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
# If no service was provided, then we can just do A/AAAA lookups on the
|
# If no service was provided, then we can just do A/AAAA lookups on the
|
||||||
|
Loading…
x
Reference in New Issue
Block a user