cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

More isinstance fixes (#3405)

Browse source 
* More isinstance fixes
* Use double types
This commit is contained in:
jctanner 2016-11-09 15:25:17 -05:00 committed by Matt Clay
parent 32fef233f2
commit b3795322e9
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/ansible/modules/extras/clustering/znode.py
View file

@ -194,7 +194,7 @@ class KazooCommandProxy():
for i in dir(zstat):
if not i.startswith('_'):
attr = getattr(zstat, i)
if type(attr) in (int, str):
if isinstance(attr, (int, str)):
stat_dict[i] = attr
result = True, {'msg': 'The node was retrieved.', 'znode': path, 'value': value,
'stat': stat_dict}

8
lib/ansible/modules/extras/network/nmcli.py
View file

@ -504,13 +504,13 @@ class Nmcli(object):
val=d[key]
str_val=""
add_string=True
if type(val)==type(dbus.Array([])):
if isinstance(val, dbus.Array):
for elt in val:
if type(elt)==type(dbus.Byte(1)):
if isinstance(elt, dbus.Byte):
str_val+="%s " % int(elt)
elif type(elt)==type(dbus.String("")):
elif isinstance(elt, dbus.String):
str_val+="%s" % elt
elif type(val)==type(dbus.Dictionary({})):
elif isinstance(val, dbus.Dictionary):
dstr+=self.dict_to_string(val)
add_string=False
else:

4
lib/ansible/modules/extras/system/osx_defaults.py
View file

@ -238,7 +238,7 @@ class OSXDefaults(object):
value = "TRUE"
else:
value = "FALSE"
elif type(self.value) is int or type(self.value) is float:
elif isinstance(self.value, (int, float)):
value = str(self.value)
elif self.array_add and self.current_value is not None:
value = list(set(self.value) - set(self.current_value))
@ -285,7 +285,7 @@ class OSXDefaults(object):
return True
# There is a type mismatch! Given type does not match the type in defaults
if self.current_value is not None and type(self.current_value) is not type(self.value):
if self.current_value is not None and not isinstance(self.current_value, type(self.value)):
raise OSXDefaultsException("Type mismatch. Type in defaults: " + type(self.current_value).__name__)
# Current value matches the given value. Nothing need to be done. Arrays need extra care