valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

rename to avoid shadowing built-in type 'type'

Browse Source
This commit is contained in:
Chris Rebert 2013-05-16 16:36:36 -07:00
parent bddcf5cb0c
commit d473176096
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
salt/utils/socket_util.py
View File

@ -137,11 +137,11 @@ def _interfaces_ip(out):
ip = value # pylint: disable-msg=C0103
cidr = 32
if type == 'inet':
if type_ == 'inet':
mask = _cidr_to_ipv4_netmask(int(cidr))
if 'brd' in cols:
brd = cols[cols.index('brd') + 1]
elif type == 'inet6':
elif type_ == 'inet6':
mask = cidr
return (ip, mask, brd)
@ -166,12 +166,12 @@ def _interfaces_ip(out):
cols = line.split()
if len(cols) >= 2:
type, value = tuple(cols[0:2])
type_, value = tuple(cols[0:2])
iflabel = cols[-1:][0]
if type in ('inet', 'inet6'):
if type_ in ('inet', 'inet6'):
if 'secondary' not in cols:
ipaddr, netmask, broadcast = parse_network(value, cols)
if type == 'inet':
if type_ == 'inet':
if 'inet' not in data:
data['inet'] = list()
addr_obj = dict()
@ -180,7 +180,7 @@ def _interfaces_ip(out):
addr_obj['broadcast'] = broadcast
addr_obj['label'] = iflabel
data['inet'].append(addr_obj)
elif type == 'inet6':
elif type_ == 'inet6':
if 'inet6' not in data:
data['inet6'] = list()
addr_obj = dict()
@ -192,14 +192,14 @@ def _interfaces_ip(out):
data['secondary'] = list()
ip_, mask, brd = parse_network(value, cols)
data['secondary'].append({
'type': type,
'type': type_,
'address': ip_,
'netmask': mask,
'broadcast': brd,
'label': iflabel,
})
del ip_, mask, brd
elif type.startswith('link'):
elif type_.startswith('link'):
data['hwaddr'] = value
if iface:
ret[iface] = data