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

Fix _compat for py3

Browse source
This commit is contained in:
twangboy 2019-02-28 15:38:26 -07:00
parent 2ebfa22f87
commit 2837bb9c17
No known key found for this signature in database
GPG key ID: 93FF3BDEB278C9EB
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/_compat.py
View file

@ -190,7 +190,10 @@ class IPv6AddressScoped(ipaddress.IPv6Address):
packed = False
if isinstance(data, bytes) and len(data) == 16 and b':' not in data:
try:
packed = bool(int(str(bytearray(data)).encode('hex'), 16))
if PY3:
packed = bool(int(str(bytearray(data, 'utf-8')).encode('utf-8').hex(), 16))
else:
packed = bool(int(str(bytearray(data)).encode('hex'), 16))
except ValueError:
pass