X-Git-Url: https://git.madduck.net/etc/taskwarrior.git/blobdiff_plain/919f61adb63e967d458122b6685f678a5fa0249f..90d018e0f0c05ecbaed4699bc743b846abeafced:/tasklib/task.py diff --git a/tasklib/task.py b/tasklib/task.py index ad27a92..72e16af 100644 --- a/tasklib/task.py +++ b/tasklib/task.py @@ -22,6 +22,7 @@ VERSION_2_3_0 = six.u('2.3.0') VERSION_2_4_0 = six.u('2.4.0') VERSION_2_4_1 = six.u('2.4.1') VERSION_2_4_2 = six.u('2.4.2') +VERSION_2_4_3 = six.u('2.4.3') logger = logging.getLogger(__name__) local_zone = tzlocal.get_localzone() @@ -89,6 +90,9 @@ class SerializingObject(object): to raise ValueError. """ + def __init__(self, warrior): + self.warrior = warrior + def _deserialize(self, key, value): hydrate_func = getattr(self, 'deserialize_{0}'.format(key), lambda x: x if x != '' else None) @@ -259,8 +263,10 @@ class SerializingObject(object): # If the value is already localized, there is no need to change # time zone at this point. Also None is a valid value too. localized = value - elif isinstance(value, six.string_types): + elif (isinstance(value, six.string_types) + and self.warrior.version > VERSION_2_4_0): # For strings, use 'task calc' to evaluate the string to datetime + # available since TW 2.4.0 args = value.split() result = self.warrior.execute_command(['calc'] + args) naive = datetime.datetime.strptime(result[0], DATE_FORMAT_CALC) @@ -376,6 +382,7 @@ class TaskAnnotation(TaskResource): def __init__(self, task, data={}): self.task = task self._load_data(data) + super(TaskAnnotation, self).__init__(task.warrior) def remove(self): self.task.remove_annotation(self) @@ -456,7 +463,7 @@ class Task(TaskResource): return task def __init__(self, warrior, **kwargs): - self.warrior = warrior + super(Task, self).__init__(warrior) # Check that user is not able to set read-only value in __init__ for key in kwargs.keys(): @@ -702,8 +709,9 @@ class TaskFilter(SerializingObject): A set of parameters to filter the task list with. """ - def __init__(self, filter_params=[]): + def __init__(self, warrior, filter_params=[]): self.filter_params = filter_params + super(TaskFilter, self).__init__(warrior) def add_filter(self, filter_str): self.filter_params.append(filter_str) @@ -738,7 +746,7 @@ class TaskFilter(SerializingObject): return [f for f in self.filter_params if f] def clone(self): - c = self.__class__() + c = self.__class__(self.warrior) c.filter_params = list(self.filter_params) return c @@ -751,7 +759,7 @@ class TaskQuerySet(object): def __init__(self, warrior=None, filter_obj=None): self.warrior = warrior self._result_cache = None - self.filter_obj = filter_obj or TaskFilter() + self.filter_obj = filter_obj or TaskFilter(warrior) def __deepcopy__(self, memo): """ @@ -866,14 +874,17 @@ class TaskWarrior(object): if create and not os.path.exists(data_location): os.makedirs(data_location) + self.version = self._get_version() self.config = { 'data.location': data_location, 'confirmation': 'no', 'dependency.confirmation': 'no', # See TW-1483 or taskrc man page 'recurrence.confirmation': 'no', # Necessary for modifying R tasks + # 2.4.3 onwards supports 0 as infite bulk, otherwise set just + # arbitrary big number which is likely to be large enough + 'bulk': 0 if self.version > VERSION_2_4_3 else 100000, } self.tasks = TaskQuerySet(self) - self.version = self._get_version() def _get_command_args(self, args, config_override={}): command_args = ['task', 'rc:{0}'.format(self.taskrc_location)] @@ -905,7 +916,7 @@ class TaskWarrior(object): else: error_msg = stdout.strip() raise TaskWarriorException(error_msg) - return stdout.strip().split('\n') + return stdout.rstrip().split('\n') def enforce_recurrence(self): # Run arbitrary report command which will trigger generation