Merge pull request #149 from vrusinov/py3

Drop Python2 support and remove code supporting it

Author: coddingtonbear

Diff for: .github/workflows/test.yml

@@ -9,12 +9,10 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [2.7, 3.5, 3.6, 3.7, 3.8]
+        python-version: [3.5, 3.6, 3.7, 3.8]
         taskwarrior-version: [2.5.0, 2.5.1, 2.5.3]
         exclude:
           # Taskwarriror 3.5.3 only supported on Python 3.7+.
-          - python-version: 2.7
-            taskwarrior-version: 2.5.3
           - python-version: 3.5
             taskwarrior-version: 2.5.3
           - python-version: 3.6

Diff for: requirements.txt

@@ -1,4 +1,3 @@
-six
 python-dateutil
 pytz
 kitchen

Diff for: setup.py

@@ -37,22 +37,18 @@
             ]
     REQUIREMENTS[category] = requirements
 
-if sys.version_info < (2, 7):
-    REQUIREMENTS['test'].append('unittest2')
-    REQUIREMENTS['install'].append('ordereddict')
-
 setup(name='taskw',
       version='1.3.1',
       description="Python bindings for your taskwarrior database",
       long_description=long_description,
       classifiers=[
           "Development Status :: 5 - Production/Stable",
-          "Programming Language :: Python :: 2",
-          "Programming Language :: Python :: 2.7",
           "Programming Language :: Python :: 3",
           "Programming Language :: Python :: 3.4",
           "Programming Language :: Python :: 3.5",
           "Programming Language :: Python :: 3.6",
+          "Programming Language :: Python :: 3.7",
+          "Programming Language :: Python :: 3.8",
           "License :: OSI Approved :: GNU General Public License (GPL)",
           "Intended Audience :: Developers",
       ],

Diff for: taskw/exceptions.py

@@ -9,13 +9,10 @@ def __init__(self, command, stderr, stdout, code):
         self.code = code
         super(TaskwarriorError, self).__init__(self.stderr)
 
-    def __unicode__(self):
+    def __str__(self):
         return "%r #%s; stderr:\"%s\"; stdout:\"%s\"" % (
             self.command,
             self.code,
             self.stderr,
             self.stdout,
         )
-
-    def __str__(self):
-        return self.__unicode__().encode(sys.getdefaultencoding(), 'replace')

Diff for: taskw/fields/annotationarray.py

@@ -1,11 +1,10 @@
 from dateutil.parser import parse
-import six
 
 from .array import ArrayField
 from .base import DirtyableList
 
 
-class Annotation(six.text_type):
+class Annotation(str):
     """ A special type of string that we'll use for storing annotations.
 
     This is, for all intents and purposes, really just a string, but
@@ -14,7 +13,7 @@ class Annotation(six.text_type):
 
     """
     def __new__(self, description, entry=None):
-        return six.text_type.__new__(self, description)
+        return str.__new__(self, description)
 
     def __init__(self, description, entry=None):
         self._entry = entry
@@ -59,5 +58,5 @@ def serialize(self, value):
         if not value:
             value = []
         return super(AnnotationArrayField, self).serialize(
-            [six.text_type(entry) for entry in value]
+            [str(entry) for entry in value]
         )

Diff for: taskw/fields/base.py

@@ -1,8 +1,6 @@
 import copy
 import sys
 
-import six
-
 
 class Field(object):
     def __init__(self, label=None, read_only=False):
@@ -25,17 +23,12 @@ def serialize(self, value):
         return value
 
     def __str__(self):
-        if sys.version_info >= (3, ):
-            return self.label
-        return self.__unicode__().encode(sys.getdefaultencoding(), 'replace')
-
-    def __unicode__(self):
         return self.label
 
     def __repr__(self):
         return "<{cls} '{label}'>".format(
-            cls=six.text_type(self.__class__.__name__),
-            label=six.text_type(self) if self._label else '(No Label)',
+            cls=str(self.__class__.__name__),
+            label=str(self) if self._label else '(No Label)',
         )
 
     def __eq__(self, other):

Diff for: taskw/fields/commaseparateduuid.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 from distutils.version import LooseVersion
 
 import uuid

Diff for: taskw/fields/string.py

@@ -1,7 +1,5 @@
 import logging
 
-import six
-
 from taskw.utils import encode_replacements_experimental
 from .base import Field
 
@@ -14,24 +12,24 @@ def deserialize(self, value):
         # If value is None, let's just let it pass through
         if not value:
             return value
-        if not isinstance(value, six.string_types):
-            value = six.text_type(value)
-        for left, right in six.iteritems(encode_replacements_experimental):
+        if not isinstance(value, str):
+            value = str(value)
+        for left, right in encode_replacements_experimental.items():
             value = value.replace(right, left)
         return value
 
     def serialize(self, value):
         # If value is None let it pass through
         if not value:
             return value
-        if not isinstance(value, six.string_types):
-            string_value = six.text_type(value)
+        if not isinstance(value, str):
+            string_value = str(value)
             logger.debug(
                 "Value %s serialized to string as '%s'",
                 repr(value),
                 string_value
             )
             value = string_value
-        for left, right in six.iteritems(encode_replacements_experimental):
+        for left, right in encode_replacements_experimental.items():
             value = value.replace(left, right)
         return value

Diff for: taskw/fields/uuid.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 import uuid
 
 from .base import Field

Diff for: taskw/task.py

@@ -3,8 +3,6 @@
 import os
 import sys
 
-import six
-
 from taskw.fields import (
     AnnotationArrayField,
     ArrayField,
@@ -73,7 +71,7 @@ def __init__(self, data, udas=None):
         self._changes = []
 
         processed = {}
-        for k, v in six.iteritems(data):
+        for k, v in data.items():
             processed[k] = self._deserialize(k, v, self._fields)
 
         super(Task, self).__init__(processed)
@@ -87,7 +85,7 @@ def from_stub(cls, data, udas=None):
         fields.update(udas)
 
         processed = {}
-        for k, v in six.iteritems(data):
+        for k, v in data.items():
             processed[k] = cls._serialize(k, v, fields)
 
         return cls(processed, udas)
@@ -173,7 +171,7 @@ def get_changes(self, serialized=False, keep=False):
             )
 
         # Check for changes on subordinate items
-        for k, v in six.iteritems(self):
+        for k, v in self.items():
             if isinstance(v, Dirtyable):
                 result = v.get_changes(keep=keep)
                 if result:
@@ -198,7 +196,7 @@ def update(self, values, force=False):
 
         """
         results = {}
-        for k, v in six.iteritems(values):
+        for k, v in values.items():
             results[k] = self.__setitem__(k, v, force=force)
         return results
 
@@ -209,13 +207,13 @@ def set(self, key, value):
     def serialized(self):
         """ Returns a serialized representation of this task."""
         serialized = {}
-        for k, v in six.iteritems(self):
+        for k, v in self.items():
             serialized[k] = self._serialize(k, v, self._fields)
         return serialized
 
     def serialized_changes(self, keep=False):
         serialized = {}
-        for k, v in six.iteritems(self.get_changes(keep=keep)):
+        for k, v in self.get_changes(keep=keep).items():
             # Here, `v` is a 2-tuple of the field's original value
             # and the field's new value.
             _, to = v

Diff for: taskw/taskrc.py

@@ -1,4 +1,3 @@
-import codecs
 import logging
 import os
 
@@ -93,7 +92,7 @@ def _merge_trees(self, left, right):
 
     def _read(self, path):
         config = {}
-        with codecs.open(path, 'r', 'utf8') as config_file:
+        with open(path, 'r') as config_file:
             for raw_line in config_file.readlines():
                 line = sanitize(raw_line)
                 if not line:
@@ -158,10 +157,7 @@ def get_udas(self):
 
         return udas
 
-    def __unicode__(self):
+    def __str__(self):
         return 'TaskRc file at {path}'.format(
             path=self.path
         )
-
-    def __str__(self):
-        return self.__unicode__().encode('utf-8', 'REPLACE')

Diff for: taskw/test/test_fields.py

@@ -4,15 +4,11 @@
 
 from dateutil.tz import tzlocal
 from pytz import UTC, timezone
-import six
 
 from taskw import fields
 from taskw.fields.annotationarray import Annotation
 
-if sys.version_info >= (2, 7):
-    from unittest import TestCase
-else:
-    from unittest2 import TestCase
+from unittest import TestCase
 
 
 class TestAnnotationArrayField(TestCase):
@@ -36,9 +32,7 @@ def test_serialize_annotations_into_strings(self):
 
         self.assertEqual(actual_serialized, expected_serialized)
         for entry in actual_serialized:
-            self.assertTrue(
-                isinstance(entry, six.text_type)
-            )
+            self.assertTrue(isinstance(entry, str))
 
     def test_deserialize_fully_formed_entries_to_stringey_things(self):
         # Note that this test is *identical* in conditions and actions

Diff for: taskw/test/test_task.py

@@ -1,10 +1,10 @@
 import copy
 import datetime
+import io
 import uuid
 from unittest import TestCase
 
 import pytz
-import six
 from dateutil.tz import tzutc
 
 from taskw.task import Task
@@ -41,7 +41,7 @@ def test_marks_date_changed(self):
         expected_changes = {'due': (original_due_date, new_due_date)}
         actual_changes = self.task.get_changes()
 
-        self.assertEqual(list(six.iterkeys(actual_changes)), ['due'])
+        self.assertEqual(list(actual_changes.keys()), ['due'])
 
         # Use assertAlmostEqual to allow for millisecond loss when
         # converting to string in setUp
@@ -165,7 +165,7 @@ def test_composition(self):
         self.assertEqual(after_composition, expected_result)
 
     def test_from_input(self):
-        input_add_data = six.StringIO(
+        input_add_data = io.StringIO(
             '{'
             '"description":"Go to Camelot",'
             '"entry":"20180618T030242Z",'
@@ -174,7 +174,7 @@ def test_from_input(self):
             '"uuid":"daa3ff05-f716-482e-bc35-3e1601e50778"'
             '}')
 
-        input_modify_data = six.StringIO(
+        input_modify_data = io.StringIO(
             '\n'.join([
                 input_add_data.getvalue(),
                 (

Diff for: taskw/test/test_taskrc.py

@@ -6,10 +6,7 @@
 from taskw.fields import NumericField, ChoiceField
 
 
-if sys.version_info >= (2, 7):
-    from unittest import TestCase
-else:
-    from unittest2 import TestCase
+from unittest import TestCase
 
 
 class TestBasicLoading(TestCase):

Diff for: taskw/test/test_utils.py

@@ -3,7 +3,6 @@
 
 import dateutil.tz
 import pytz
-import six
 
 from taskw.utils import (
     convert_dict_to_override_args,
@@ -74,9 +73,7 @@ def test_with_backslashes(self):
 
     def test_with_unicode(self):
         expected = {
-            six.text_type('andthis'): (
-                six.text_type('has a fucking \\backslash in it')
-            )
+            'andthis': 'has a fucking \\backslash in it'
         }
         line = r'[andthis:"has a fucking \\backslash in it"]'
         r = decode_task(line)