task names can be unicode strings too, better to check against basestring

This commit is contained in:
David Rose 2016-05-13 18:21:12 -07:00
parent 0b224a320a
commit 28cbe13d85

View File

@ -397,7 +397,7 @@ class TaskManager:
'Task %s does not accept arguments.' % (repr(task))) 'Task %s does not accept arguments.' % (repr(task)))
if name is not None: if name is not None:
assert isinstance(name, str), 'Name must be a string type' assert isinstance(name, basestring), 'Name must be a string type'
task.setName(name) task.setName(name)
assert task.hasName() assert task.hasName()
@ -431,7 +431,7 @@ class TaskManager:
all tasks with the indicated name are removed. Returns the all tasks with the indicated name are removed. Returns the
number of tasks removed. """ number of tasks removed. """
if isinstance(taskOrName, str): if isinstance(taskOrName, basestring):
tasks = self.mgr.findTasks(taskOrName) tasks = self.mgr.findTasks(taskOrName)
return self.mgr.remove(tasks) return self.mgr.remove(tasks)
elif isinstance(taskOrName, AsyncTask): elif isinstance(taskOrName, AsyncTask):