More isinstance fixes (#3405)

* More isinstance fixes
* Use double types
This commit is contained in:
jctanner 2016-11-09 15:25:17 -05:00 committed by Matt Clay
commit b3795322e9
3 changed files with 7 additions and 7 deletions

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