Merge branch 'develop'

Author: robgolding

.travis.yml

@@ -12,8 +12,6 @@ env:
   - TASK_VERSION=v2.5.0
   - TASK_VERSION=v2.5.1
 python:
-  - "2.7"
-  - "3.4"
   - "3.5"
   - "3.6"
   - "3.7"

setup.py

@@ -1,8 +1,8 @@
 from setuptools import setup, find_packages
 
-install_requirements = ['six>=1.4', 'pytz', 'tzlocal']
+install_requirements = ['pytz', 'tzlocal']
 
-version = '1.3.0'
+version = '2.1.0'
 
 try:
     import importlib
@@ -26,12 +26,11 @@
     classifiers=[
         'Development Status :: 4 - Beta',
         'Programming Language :: Python',
-        "Programming Language :: Python :: 2",
-        "Programming Language :: Python :: 2.6",
-        "Programming Language :: Python :: 2.7",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.2",
-        "Programming Language :: Python :: 3.3",
+        "Programming Language :: Python :: 3.5",
+        "Programming Language :: Python :: 3.6",
+        "Programming Language :: Python :: 3.7",
+        "Programming Language :: Python :: 3.8",
         'License :: OSI Approved :: BSD License',
         'Topic :: Software Development :: Libraries :: Python Modules',
         'Intended Audience :: Developers',

tasklib/backends.py

@@ -5,8 +5,8 @@
 import logging
 import os
 import re
-import six
 import subprocess
+from functools import lru_cache
 
 from .task import Task, TaskQuerySet, ReadOnlyDictView
 from .filters import TaskWarriorFilter
@@ -84,15 +84,15 @@ class TaskWarriorException(Exception):
 
 class TaskWarrior(Backend):
 
-    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')
+    VERSION_2_1_0 = '2.1.0'
+    VERSION_2_2_0 = '2.2.0'
+    VERSION_2_3_0 = '2.3.0'
+    VERSION_2_4_0 = '2.4.0'
+    VERSION_2_4_1 = '2.4.1'
+    VERSION_2_4_2 = '2.4.2'
+    VERSION_2_4_3 = '2.4.3'
+    VERSION_2_4_4 = '2.4.4'
+    VERSION_2_4_5 = '2.4.5'
 
     def __init__(self, data_location=None, create=True,
                  taskrc_location=None, task_command='task',
@@ -142,8 +142,8 @@ def _get_command_args(self, args, config_override=None):
         for item in overrides.items():
             command_args.append('rc.{0}={1}'.format(*item))
         command_args.extend([
-            x.decode('utf-8') if isinstance(x, six.binary_type)
-            else six.text_type(x) for x in args
+            x.decode('utf-8') if isinstance(x, bytes)
+            else str(x) for x in args
         ])
         return command_args
 
@@ -168,10 +168,10 @@ def add_field(field):
             if serialized_value == '':
                 escaped_serialized_value = ''
             else:
-                escaped_serialized_value = six.u("'{0}'").format(
+                escaped_serialized_value = "'{0}'".format(
                     serialized_value)
 
-            format_default = lambda task: six.u("{0}:{1}").format(
+            format_default = lambda task: "{0}:{1}".format(
                 field, escaped_serialized_value)
 
             format_func = getattr(self, 'format_{0}'.format(field),
@@ -223,7 +223,7 @@ def format_description(self, task):
         if self.version < self.VERSION_2_4_0:
             return task._data['description']
         else:
-            return six.u("description:'{0}'").format(
+            return "description:'{0}'".format(
                 task._data['description'] or '',
             )
 
@@ -321,6 +321,10 @@ def merge_with(self, path, push=False):
     def undo(self):
         self.execute_command(['undo'])
 
+    @lru_cache(maxsize=128)
+    def get_task(self, uuid):
+        return self.tasks.get(uuid=uuid)
+
     # Backend interface implementation
 
     def filter_tasks(self, filter_obj):

tasklib/filters.py

@@ -1,5 +1,4 @@
 import abc
-import six
 from .serializing import SerializingObject
 
 
@@ -68,7 +67,7 @@ def add_filter_param(self, key, value):
                 modifier = '.is' if value else '.none'
                 key = key + modifier if '.' not in key else key
 
-            self.filter_params.append(six.u("{0}:{1}").format(key, value))
+            self.filter_params.append("{0}:{1}".format(key, value))
 
     def get_filter_params(self):
         return [f for f in self.filter_params if f]

tasklib/lazy.py

@@ -71,8 +71,7 @@ def replace(self):
         Performs conversion to the regular Task object, referenced by the
         stored UUID.
         """
-
-        replacement = self._tw.tasks.get(uuid=self._uuid)
+        replacement = self._tw.get_task(self._uuid)
         self.__class__ = replacement.__class__
         self.__dict__ = replacement.__dict__
 

tasklib/serializing.py

@@ -2,7 +2,6 @@
 import importlib
 import json
 import pytz
-import six
 import tzlocal
 
 
@@ -177,7 +176,7 @@ def serialize_tags(self, tags):
         return ','.join(tags) if tags else ''
 
     def deserialize_tags(self, tags):
-        if isinstance(tags, six.string_types):
+        if isinstance(tags, str):
             return set(tags.split(',')) if tags else set()
         return set(tags or [])
 
@@ -236,7 +235,7 @@ def datetime_normalizer(self, 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):
+        elif isinstance(value, str):
             localized = self.backend.convert_datetime_string(value)
         else:
             raise ValueError("Provided value could not be converted to "
@@ -247,7 +246,7 @@ def datetime_normalizer(self, value):
 
     def normalize_uuid(self, value):
         # Enforce sane UUID
-        if not isinstance(value, six.string_types) or value == '':
+        if not isinstance(value, str) or value == '':
             raise ValueError("UUID must be a valid non-empty string, "
                              "not: {}".format(value))
 

tasklib/task.py

@@ -4,7 +4,6 @@
 import json
 import logging
 import os
-import six
 import sys
 
 from .serializing import SerializingObject
@@ -41,10 +40,10 @@ def __iter__(self):
     def __len__(self):
         return len(self.viewed_dict)
 
-    def __unicode__(self):
-        return six.u('ReadOnlyDictView: {0}'.format(repr(self.viewed_dict)))
+    def __str__(self):
+        return 'ReadOnlyDictView: {0}'.format(repr(self.viewed_dict))
 
-    __repr__ = __unicode__
+    __repr__ = __str__
 
     def get(self, key, default=None):
         return copy.deepcopy(self.viewed_dict.get(key, default))
@@ -106,10 +105,7 @@ def __setitem__(self, key, value):
         self._data[key] = value
 
     def __str__(self):
-        s = six.text_type(self.__unicode__())
-        if not six.PY3:
-            s = s.encode('utf-8')
-        return s
+        return str(self['description'])
 
     def __repr__(self):
         return str(self)
@@ -121,7 +117,7 @@ def export_data(self):
 
         # We need to remove spaces for TW-1504, use custom separators
         data_tuples = ((key, self._serialize(key, value))
-                       for key, value in six.iteritems(self._data))
+                       for key, value in self._data.items())
 
         # Empty string denotes empty serialized value, we do not want
         # to pass that to TaskWarrior.
@@ -160,9 +156,6 @@ def __init__(self, task, data=None):
     def remove(self):
         self.task.remove_annotation(self)
 
-    def __unicode__(self):
-        return self['description']
-
     def __eq__(self, other):
         # consider 2 annotations equal if they belong to the same task, and
         # their data dics are the same
@@ -171,8 +164,6 @@ def __eq__(self, other):
     def __ne__(self, other):
         return not self.__eq__(other)
 
-    __repr__ = __unicode__
-
 
 class Task(TaskResource):
     read_only_fields = ['id', 'entry', 'urgency', 'uuid', 'modified']
@@ -266,14 +257,14 @@ def __init__(self, backend, **kwargs):
 
         # Rather unfortunate syntax due to python2.6 comaptiblity
         self._data = dict((key, self._normalize(key, value))
-                          for (key, value) in six.iteritems(kwargs))
+                          for (key, value) in kwargs.items())
         self._original_data = copy.deepcopy(self._data)
 
         # Provide read only access to the original data
         self.original = ReadOnlyDictView(self._original_data)
 
-    def __unicode__(self):
-        return self['description']
+    def __str__(self):
+        return str(self['description'])
 
     def __eq__(self, other):
         if self['uuid'] and other['uuid']:
@@ -296,23 +287,23 @@ def __hash__(self):
 
     @property
     def completed(self):
-        return self['status'] == six.text_type('completed')
+        return self['status'] == 'completed'
 
     @property
     def deleted(self):
-        return self['status'] == six.text_type('deleted')
+        return self['status'] == 'deleted'
 
     @property
     def waiting(self):
-        return self['status'] == six.text_type('waiting')
+        return self['status'] == 'waiting'
 
     @property
     def pending(self):
-        return self['status'] == six.text_type('pending')
+        return self['status'] == 'pending'
 
     @property
     def recurring(self):
-        return self['status'] == six.text_type('recurring')
+        return self['status'] == 'recurring'
 
     @property
     def active(self):