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

Replace type() checks with isinstance()

Browse source 
Fixes the bug I introduced in my previous commit (six.string_types is
(basestring,) on Python 2).  Thanks @abadger for noticing!
This commit is contained in:
Marius Gedminas 2015-09-04 09:47:17 +03:00
parent 37be9539ff
commit 0eb0b56722
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
contrib/inventory/apache-libcloud.py
View file

@ -260,11 +260,11 @@ class LibcloudInventory(object):
key = self.to_safe('ec2_' + key) key = self.to_safe('ec2_' + key)
# Handle complex types # Handle complex types
if type(value) in [int, bool]: if isinstance(value, (int, bool)):
instance_vars[key] = value instance_vars[key] = value
elif type(value) in string_types: elif isinstance(value, string_types):
instance_vars[key] = value.strip() instance_vars[key] = value.strip()
elif type(value) == type(None): elif value is None:
instance_vars[key] = '' instance_vars[key] = ''
elif key == 'ec2_region': elif key == 'ec2_region':
instance_vars[key] = value.name instance_vars[key] = value.name