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

Use six to ensure unicode value

Browse source
This commit is contained in:
twangboy 2017-12-01 16:12:10 -07:00
parent 9b5d8c421b
commit 5ac8112585
No known key found for this signature in database
GPG key ID: 93FF3BDEB278C9EB
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
salt/ext/win_inet_pton.py
View file

@ -10,6 +10,7 @@ import socket
import ctypes
import os
import ipaddress
import six
class sockaddr(ctypes.Structure):
@ -36,7 +37,7 @@ 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(ip_string.encode().decode())
ipaddress.ip_address(six.u(ip_string))
except ValueError:
raise socket.error('illegal IP address string passed to inet_pton')
return socket.inet_aton(ip_string)