]> git.madduck.net Git - etc/taskwarrior.git/blobdiff - tasklib/serializing.py

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:

Bump version for 0.11.0 release
[etc/taskwarrior.git] / tasklib / serializing.py
index 5d848ff1fe23028d2eaa9d32105e7d6be5d875dd..767f7df7cc47f3cb52dfd0f85a084b1af4e0bea5 100644 (file)
@@ -1,3 +1,14 @@
+import datetime
+import importlib
+import json
+import pytz
+import six
+import tzlocal
+
+DATE_FORMAT = '%Y%m%dT%H%M%SZ'
+local_zone = tzlocal.get_localzone()
+
+
 class SerializingObject(object):
     """
     Common ancestor for TaskResource & TaskWarriorFilter, since they both
@@ -25,8 +36,8 @@ class SerializingObject(object):
         to raise ValueError.
     """
 
-    def __init__(self, warrior):
-        self.warrior = warrior
+    def __init__(self, backend):
+        self.backend = backend
 
     def _deserialize(self, key, value):
         hydrate_func = getattr(self, 'deserialize_{0}'.format(key),
@@ -155,6 +166,8 @@ class SerializingObject(object):
         return serialized_annotations if serialized_annotations else ''
 
     def deserialize_annotations(self, data):
+        task_module = importlib.import_module('tasklib.task')
+        TaskAnnotation = getattr(task_module, 'TaskAnnotation')
         return [TaskAnnotation(self, d) for d in data] if data else []
 
     def serialize_tags(self, tags):
@@ -180,7 +193,7 @@ class SerializingObject(object):
         else:
             uuids = raw_uuids
 
-        return set(self.warrior.tasks.get(uuid=uuid) for uuid in uuids if uuid)
+        return set(self.backend.tasks.get(uuid=uuid) for uuid in uuids if uuid)
 
     def datetime_normalizer(self, value):
         """
@@ -192,8 +205,10 @@ class SerializingObject(object):
         localized datetime -> localized datetime (no conversion)
         """
 
-        if (isinstance(value, datetime.date)
-            and not isinstance(value, datetime.datetime)):
+        if (
+            isinstance(value, datetime.date)
+            and not isinstance(value, datetime.datetime)
+        ):
             # Convert to local midnight
             value_full = datetime.datetime.combine(value, datetime.time.min)
             localized = local_zone.localize(value_full)
@@ -205,14 +220,8 @@ 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)
-                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)
-            localized = local_zone.localize(naive)
+        elif isinstance(value, six.string_types):
+            localized = self.backend.convert_datetime_string(value)
         else:
             raise ValueError("Provided value could not be converted to "
                              "datetime, its type is not supported: {}"
@@ -227,5 +236,3 @@ class SerializingObject(object):
                              "not: {}".format(value))
 
         return value
-
-