Commit f42f5e67 by James Cammarata

Merge pull request #12552 from mgedmin/py3k

Python 3: there's no basestring
parents 95ede22a 5edd6d9b
......@@ -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 = ""
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment