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

Simplify checking clause

Browse source
This commit is contained in:
Bo Maryniuk 2018-09-19 15:26:16 +02:00
parent 7f2208b2d0
commit 12038eaacf
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
salt/_compat.py
View file

@ -144,6 +144,10 @@ class IPv6AddressScoped(ipaddress.IPv6Address):
:param address:
'''
if not hasattr(self, '_is_packed_binary'):
# This method (below) won't be around for Python 3 and we need check this differently anyway
self._is_packed_binary = lambda p: isinstance(p, bytes)
if isinstance(address, string_types) and '%' in address:
buff = address.split('%')
if len(buff) != 2:
@ -160,8 +164,7 @@ class IPv6AddressScoped(ipaddress.IPv6Address):
if isinstance(address, integer_types):
self._check_int_address(address)
self._ip = address
elif (sys.version_info.major == 3 and isinstance(address, bytes) # Python-3 compatibility messes up
or sys.version_info.major == 2 and self._is_packed_binary(address)): # bytes and str types for Python 2.
elif self._is_packed_binary(address):
self._check_packed_address(address, 16)
self._ip = ipaddress._int_from_bytes(address, 'big')
else: