From 0eb0b56722f2852d187d08265237750001f049aa Mon Sep 17 00:00:00 2001 From: Marius Gedminas Date: Fri, 4 Sep 2015 09:47:17 +0300 Subject: Replace type() checks with isinstance() Fixes the bug I introduced in my previous commit (six.string_types is (basestring,) on Python 2). Thanks @abadger for noticing! --- contrib/inventory/apache-libcloud.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/inventory/apache-libcloud.py b/contrib/inventory/apache-libcloud.py index 5ac0d9c7a5..f7d64c257c 100755 --- a/contrib/inventory/apache-libcloud.py +++ b/contrib/inventory/apache-libcloud.py @@ -260,11 +260,11 @@ class LibcloudInventory(object): key = self.to_safe('ec2_' + key) # Handle complex types - if type(value) in [int, bool]: + if isinstance(value, (int, bool)): instance_vars[key] = value - elif type(value) in string_types: + elif isinstance(value, string_types): instance_vars[key] = value.strip() - elif type(value) == type(None): + elif value is None: instance_vars[key] = '' elif key == 'ec2_region': instance_vars[key] = value.name -- cgit v1.2.1