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

Lintfix

Browse source
This commit is contained in:
Bo Maryniuk 2018-09-21 11:30:46 +02:00
parent f52ea0be7c
commit 5932a0d152
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
salt/_compat.py
View file

@ -156,10 +156,6 @@ class IPv6AddressScoped(ipaddress.IPv6Address):
ipaddress._BaseAddress.__init__(self, address)
ipaddress._BaseV6.__init__(self, address)
else:
# This method (below) won't be around for Python 3
# and this type is needed to be checked differently
self._is_packed_binary = lambda p: isinstance(p, bytes)
# Python 3.4 fix. Versions higher are simply not affected
# https://github.com/python/cpython/blob/3.4/Lib/ipaddress.py#L543-L544
self._version = 6
@ -185,6 +181,9 @@ class IPv6AddressScoped(ipaddress.IPv6Address):
:param data:
:return:
'''
if sys.version_info.major > 2:
return isinstance(data, bytes)
packed = False
if len(data) == 16 and ':' not in data:
try: