Skip to content

Commit 570f677

Browse files
committed
task: Do not rely on raw value of waiting status
This makes waiting compatible with 2.6.0 and newer.
1 parent 90ee349 commit 570f677

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

tasklib/task.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
from __future__ import print_function
22
import copy
3+
import datetime
34
import importlib
45
import json
56
import logging
67
import os
78
import sys
89

9-
from .serializing import SerializingObject
10+
from .serializing import SerializingObject, local_zone
1011

1112
DATE_FORMAT = '%Y%m%dT%H%M%SZ'
1213
REPR_OUTPUT_SIZE = 10
@@ -295,7 +296,10 @@ def deleted(self):
295296

296297
@property
297298
def waiting(self):
298-
return self['status'] == 'waiting'
299+
if not self['wait']:
300+
return False
301+
302+
return self['wait'] > local_zone.localize(datetime.datetime.now())
299303

300304
@property
301305
def pending(self):
@@ -523,7 +527,7 @@ def deleted(self):
523527
return self.filter(status=DELETED)
524528

525529
def waiting(self):
526-
return self.filter(status=WAITING)
530+
return self.filter(wait__after='now')
527531

528532
def recurring(self):
529533
return self.filter(status=RECURRING)

0 commit comments

Comments
 (0)