]> git.madduck.net Git - etc/taskwarrior.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

versions: Use version constants
authorTomas Babej <tomasbabej@gmail.com>
Thu, 6 Aug 2015 21:29:27 +0000 (23:29 +0200)
committerTomas Babej <tomasbabej@gmail.com>
Thu, 6 Aug 2015 21:29:27 +0000 (23:29 +0200)
tasklib/task.py

index 0451fb03ce4575fe6ae2a7e80993cd300e44b4fd..f853bdc562c8c555ad0e9bef2253269d281ef4a0 100644 (file)
@@ -24,6 +24,8 @@ 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')
 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')
+VERSION_2_4_4 = six.u('2.4.4')
+VERSION_2_4_5 = six.u('2.4.5')
 
 logger = logging.getLogger(__name__)
 local_zone = tzlocal.get_localzone()
 
 logger = logging.getLogger(__name__)
 local_zone = tzlocal.get_localzone()
@@ -761,7 +763,7 @@ class Task(TaskResource):
         # For older TW versions attempt to uniquely locate the task
         # using the data we have if it has been just saved.
         # This can happen when adding a completed task on older TW versions.
         # For older TW versions attempt to uniquely locate the task
         # using the data we have if it has been just saved.
         # This can happen when adding a completed task on older TW versions.
-        if (not valid(output) and self.warrior.version < six.text_type(u'2.4.5')
+        if (not valid(output) and self.warrior.version < VERSION_2_4_4
                 and after_save):
 
             # Make a copy, removing ID and UUID. It's most likely invalid
                 and after_save):
 
             # Make a copy, removing ID and UUID. It's most likely invalid
@@ -827,7 +829,7 @@ class TaskFilter(SerializingObject):
             # We enforce equality match by using 'is' (or 'none') modifier
             # Without using this syntax, filter fails due to TW-1479
             # which is, however, fixed in 2.4.5
             # We enforce equality match by using 'is' (or 'none') modifier
             # Without using this syntax, filter fails due to TW-1479
             # which is, however, fixed in 2.4.5
-            if self.warrior.version < six.text_type(u'2.5.0'):
+            if self.warrior.version < VERSION_2_4_5:
                 modifier = '.is' if value else '.none'
                 key = key + modifier if '.' not in key else key
 
                 modifier = '.is' if value else '.none'
                 key = key + modifier if '.' not in key else key