saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #49353 from dwoz/boto_fix

Browse source 
Do not raise exception if passed bytes
This commit is contained in:
Daniel Wozniak 2018-08-27 18:49:02 -07:00 • committed by GitHub
commit f08e7208af
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
salt/ext/win_inet_pton.py
View file

@ -37,7 +37,10 @@ def inet_pton(address_family, ip_string):
# This will catch IP Addresses such as 10.1.2
if address_family == socket.AF_INET:
try:
ipaddress.ip_address(six.u(ip_string))
if isinstance(ip_string, six.binary_type):
ipaddress.ip_address(six.u(ip_string))
else:
ipaddress.ip_address(ip_string)
except ValueError:
raise socket.error('illegal IP address string passed to inet_pton')
return socket.inet_aton(ip_string)