tests: Explicitly mark unicode strings used for testing

[etc/taskwarrior.git] / tasklib / task.py

diff --git a/tasklib/task.py b/tasklib/task.py
index 72e16af4d33d612938c0ffac314e5812ef97f87e..79899ba6b38cd349216f2e362e9bd90e9217e335 100644 (file)
--- a/tasklib/task.py
+++ b/tasklib/task.py
@@ -264,7 +264,7 @@ class SerializingObject(object):
                 # time zone at this point. Also None is a valid value too.
                 localized = value
         elif (isinstance(value, six.string_types)
                 # time zone at this point. Also None is a valid value too.
                 localized = value
         elif (isinstance(value, six.string_types)

-                and self.warrior.version > VERSION_2_4_0):
+                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()
             # For strings, use 'task calc' to evaluate the string to datetime
             # available since TW 2.4.0
             args = value.split()


@@ -518,6 +518,10 @@ class Task(TaskResource):
     def pending(self):
         return self['status'] == six.text_type('pending')
 
     def pending(self):
         return self['status'] == six.text_type('pending')
 

+    @property
+    def active(self):
+        return self['start'] is not None
+

     @property
     def saved(self):
         return self['uuid'] is not None or self['id'] is not None
     @property
     def saved(self):
         return self['uuid'] is not None or self['id'] is not None


@@ -862,8 +866,7 @@ class TaskQuerySet(object):
 
 
 class TaskWarrior(object):
 
 
 class TaskWarrior(object):

-    def __init__(self, data_location='~/.task', create=True, taskrc_location='~/.taskrc'):
-        data_location = os.path.expanduser(data_location)
+    def __init__(self, data_location=None, create=True, taskrc_location='~/.taskrc'):

         self.taskrc_location = os.path.expanduser(taskrc_location)
 
         # If taskrc does not exist, pass / to use defaults and avoid creating
         self.taskrc_location = os.path.expanduser(taskrc_location)
 
         # If taskrc does not exist, pass / to use defaults and avoid creating


@@ -871,19 +874,23 @@ class TaskWarrior(object):
         if not os.path.exists(self.taskrc_location):
             self.taskrc_location = '/'
 
         if not os.path.exists(self.taskrc_location):
             self.taskrc_location = '/'
 

-        if create and not os.path.exists(data_location):
-            os.makedirs(data_location)
-

         self.version = self._get_version()
         self.config = {
         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
             '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,
+            'bulk': 0 if self.version >= VERSION_2_4_3 else 100000,

         }
         }

+
+        # Set data.location override if passed via kwarg
+        if data_location is not None:
+            data_location = os.path.expanduser(data_location)
+            if create and not os.path.exists(data_location):
+                os.makedirs(data_location)
+            self.config['data.location'] = data_location
+

         self.tasks = TaskQuerySet(self)
 
     def _get_command_args(self, args, config_override={}):
         self.tasks = TaskQuerySet(self)
 
     def _get_command_args(self, args, config_override={}):