]> 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:

TaskWarrior: Move version contastants into the class namespace
authorTomas Babej <tomasbabej@gmail.com>
Sat, 8 Aug 2015 23:47:31 +0000 (01:47 +0200)
committerTomas Babej <tomasbabej@gmail.com>
Sun, 9 Aug 2015 00:25:21 +0000 (02:25 +0200)
tasklib/backends.py
tasklib/filters.py

index 1eb83b75407467c982d9a3a5465c8d160e1dd949..adfb9a460955f45bb037ee5bdfac1730ab7ec158 100644 (file)
@@ -13,16 +13,6 @@ from .serializing import local_zone
 
 DATE_FORMAT_CALC = '%Y-%m-%dT%H:%M:%S'
 
 
 DATE_FORMAT_CALC = '%Y-%m-%dT%H:%M:%S'
 
-VERSION_2_1_0 = six.u('2.1.0')
-VERSION_2_2_0 = six.u('2.2.0')
-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')
-VERSION_2_4_4 = six.u('2.4.4')
-VERSION_2_4_5 = six.u('2.4.5')
-
 logger = logging.getLogger(__name__)
 
 class Backend(object):
 logger = logging.getLogger(__name__)
 
 class Backend(object):
@@ -91,6 +81,17 @@ class TaskWarriorException(Exception):
 
 
 class TaskWarrior(object):
 
 
 class TaskWarrior(object):
+
+    VERSION_2_1_0 = six.u('2.1.0')
+    VERSION_2_2_0 = six.u('2.2.0')
+    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')
+    VERSION_2_4_4 = six.u('2.4.4')
+    VERSION_2_4_5 = six.u('2.4.5')
+
     def __init__(self, data_location=None, create=True, taskrc_location='~/.taskrc'):
         self.taskrc_location = os.path.expanduser(taskrc_location)
 
     def __init__(self, data_location=None, create=True, taskrc_location='~/.taskrc'):
         self.taskrc_location = os.path.expanduser(taskrc_location)
 
@@ -110,7 +111,7 @@ class TaskWarrior(object):
 
             # 2.4.3 onwards supports 0 as infite bulk, otherwise set just
             # arbitrary big number which is likely to be large enough
 
             # 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 >= self.VERSION_2_4_3 else 100000,
         }
 
         # Set data.location override if passed via kwarg
         }
 
         # Set data.location override if passed via kwarg
@@ -197,14 +198,14 @@ class TaskWarrior(object):
     def format_description(self, task):
         # Task version older than 2.4.0 ignores first word of the
         # task description if description: prefix is used
     def format_description(self, task):
         # Task version older than 2.4.0 ignores first word of the
         # task description if description: prefix is used
-        if self.version < VERSION_2_4_0:
+        if self.version < self.VERSION_2_4_0:
             return task._data['description']
         else:
             return six.u("description:'{0}'").format(task._data['description'] or '')
 
     def convert_datetime_string(self, value):
 
             return task._data['description']
         else:
             return six.u("description:'{0}'").format(task._data['description'] or '')
 
     def convert_datetime_string(self, value):
 
-        if self.version >= VERSION_2_4_0:
+        if self.version >= self.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()
@@ -266,7 +267,7 @@ class TaskWarrior(object):
         # of recurrent tasks.
 
         # Only necessary for TW up to 2.4.1, fixed in 2.4.2.
         # of recurrent tasks.
 
         # Only necessary for TW up to 2.4.1, fixed in 2.4.2.
-        if self.version < VERSION_2_4_2:
+        if self.version < self.VERSION_2_4_2:
             self.execute_command(['next'], allow_failure=False)
 
     def merge_with(self, path, push=False):
             self.execute_command(['next'], allow_failure=False)
 
     def merge_with(self, path, push=False):
@@ -337,7 +338,7 @@ class TaskWarrior(object):
 
     def complete_task(self, task):
         # Older versions of TW do not stop active task at completion
 
     def complete_task(self, task):
         # Older versions of TW do not stop active task at completion
-        if self.version < VERSION_2_4_0 and task.active:
+        if self.version < self.VERSION_2_4_0 and task.active:
             task.stop()
 
         self.execute_command([task['uuid'], 'done'])
             task.stop()
 
         self.execute_command([task['uuid'], 'done'])
@@ -363,7 +364,7 @@ class TaskWarrior(object):
         # 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.version < VERSION_2_4_5
+        if (not valid(output) and self.version < self.VERSION_2_4_5
                 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
index 0a74c3c7582e669c07e0ac1eb3107504b63bdf22..b85a8825ea2db6bb3f949c3dfb7716b81cbedf34 100644 (file)
@@ -64,7 +64,7 @@ class TaskWarriorFilter(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 < VERSION_2_4_5:
+            if self.warrior.version < warrior.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