ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-09-04 12:12:19 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge pull request #12552 from mgedmin/py3k

Browse source 
Python 3: there's no basestring
This commit is contained in:
James Cammarata 2015-09-29 09:30:15 -04:00
commit f42f5e6740
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/ansible/playbook/task.py
View file

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