summaryrefslogtreecommitdiff
path: root/contrib/inventory/vmware.py
diff options
context:
space:
mode:
authorToshio Kuratomi <a.badger@gmail.com>2016-08-23 13:13:44 -0700
committerGitHub <noreply@github.com>2016-08-23 13:13:44 -0700
commita22909c226eecd4632de45c04607ebddfeb96a19 (patch)
treeedd4e9276d354ac44c97855a8cd97547f05c700e /contrib/inventory/vmware.py
parenta695e18615792b50b24f1b5b5e80ca479fbb74a5 (diff)
downloadansible-a22909c226eecd4632de45c04607ebddfeb96a19.tar.gz
Migrate basestring to a python3 compatible type (#17199)
Diffstat (limited to 'contrib/inventory/vmware.py')
-rwxr-xr-xcontrib/inventory/vmware.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/inventory/vmware.py b/contrib/inventory/vmware.py
index c84371f63a..377c7cb83a 100755
--- a/contrib/inventory/vmware.py
+++ b/contrib/inventory/vmware.py
@@ -40,7 +40,7 @@ import sys
import time
import ConfigParser
-from six import text_type
+from six import text_type, string_types
# Disable logging message trigged by pSphere/suds.
try:
@@ -160,7 +160,7 @@ class VMwareInventory(object):
if isinstance(v, collections.MutableMapping):
items.extend(self._flatten_dict(v, new_key, sep).items())
elif isinstance(v, (list, tuple)):
- if all([isinstance(x, basestring) for x in v]):
+ if all([isinstance(x, string_types) for x in v]):
items.append((new_key, v))
else:
items.append((new_key, v))
@@ -208,7 +208,7 @@ class VMwareInventory(object):
if obj_info != ():
l.append(obj_info)
return l
- elif isinstance(obj, (type(None), bool, int, long, float, basestring)):
+ elif isinstance(obj, (type(None), bool, int, long, float, string_types)):
return obj
else:
return ()