1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00

Merge pull request #12552 from mgedmin/py3k

Python 3: there's no basestring
This commit is contained in:
James Cammarata 2015-09-29 09:30:15 -04:00
commit f42f5e6740

View file

@ -118,7 +118,7 @@ class Task(Base, Conditional, Taggable, Become):
def _merge_kv(self, ds):
if ds is None:
return ""
elif isinstance(ds, basestring):
elif isinstance(ds, string_types):
return ds
elif isinstance(ds, dict):
buf = ""