Merge pull request #80 from alanshaw/master

fix get address info for IPv4 addresses
sammachin-gprs
Marek Ventur 2018-09-02 14:16:48 +01:00 committed by GitHub
commit 6326007b6d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 6 deletions

View File

@ -199,10 +199,7 @@ def open_http_socket(method, url, json=None, timeout=None, headers=None, data=No
def get_address_info(host, port, retries_left = 20):
try:
if is_ipv4_address(host):
addr = (host, port)
else:
return usocket.getaddrinfo(host, port)[0][4]
return usocket.getaddrinfo(host, port)[0][4]
except OSError as e:
if ("-15" in str(e)) and retries_left:
# [addrinfo error -15]
@ -268,5 +265,3 @@ def is_ipv4_address(address):
return len(valid_octets) == 4
except Exception:
return False