tests: Use sys.version_info instead of sys.vesion to compare versions

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

diff --git a/tasklib/task.py b/tasklib/task.py
index b9103d1c309594ecede2fbeb2bfe4252b5635ea2..75f218b048f28a924bc4fda9c033c3a45e31cd8f 100644 (file)
--- 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()
@@ -263,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)
-                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()
@@ -873,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)]
@@ -912,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