Fix various import issues

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

diff --git a/tasklib/serializing.py b/tasklib/serializing.py
index 5d848ff1fe23028d2eaa9d32105e7d6be5d875dd..ee04d38d2c178d0203763e3962eb50a8b3edf7f4 100644 (file)
--- a/tasklib/serializing.py
+++ b/tasklib/serializing.py
@@ -1,3 +1,12 @@
+import datetime
+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
 class SerializingObject(object):
     """
     Common ancestor for TaskResource & TaskWarriorFilter, since they both


@@ -25,8 +34,8 @@ class SerializingObject(object):
         to raise ValueError.
     """
 
         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),
 
     def _deserialize(self, key, value):
         hydrate_func = getattr(self, 'deserialize_{0}'.format(key),


@@ -180,7 +189,7 @@ class SerializingObject(object):
         else:
             uuids = raw_uuids
 
         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):
         """
 
     def datetime_normalizer(self, value):
         """


@@ -205,14 +214,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
                 # 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: {}"
         else:
             raise ValueError("Provided value could not be converted to "
                              "datetime, its type is not supported: {}"