Commit 5edd6d9b by Marius Gedminas

Python 3: there's no basestring

Fixes another failing test.

(I don't want to do a global search/replace for 'basestring' because I
want to have unit tests covering each occurrence.  When I run out of
existing failing tests, I'll try to write new ones.)
parent 95ede22a
...@@ -118,7 +118,7 @@ class Task(Base, Conditional, Taggable, Become): ...@@ -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 = ""
......
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