Merge pull request #12552 from mgedmin/py3k

Python 3: there's no basestring
9 years ago · f42f5e6740
parent 95ede22a1e 5edd6d9be4
commit f42f5e6740
1 changed files with 1 additions and 1 deletions
--- a/lib/ansible/playbook/task.py
+++ b/lib/ansible/playbook/task.py
@ -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 = ""