Merging upstream version 2.3~rc1.
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
972d2d9aa2
commit
ca2ec6771a
37 changed files with 1946 additions and 407 deletions
|
@ -309,7 +309,7 @@ class AsyncTask: # pylint: disable=too-many-instance-attributes
|
|||
'''Return object members as a dictionary'''
|
||||
info = {
|
||||
'fail count': self._fail_cnt,
|
||||
'completed': self._task.get_completed(),
|
||||
'completed': self._task.get_completed() if self._task else None,
|
||||
'alive': self._alive(),
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue