Merge branch 'develop'

Author: robgolding

.travis.yml

@@ -13,16 +13,17 @@ env:
   - TASK_VERSION=v2.5.1
 python:
   - "2.7"
-  - "3.3"
   - "3.4"
   - "3.5"
   - "3.6"
+  - "3.7"
+  - "3.8"
 install:
   - pip install -e .
   - pip install coveralls
   - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
   - sudo apt-get update -qq
-  - sudo apt-get install -qq build-essential cmake uuid-dev g++-4.8
+  - sudo apt-get install -qq build-essential cmake uuid-dev libgnutls-dev g++-4.8
   - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 50
   - git clone --recursive https://github.com/GothenburgBitFactory/taskwarrior
   - cd taskwarrior

README.rst

@@ -10,7 +10,7 @@ tasklib
 tasklib is a Python library for interacting with taskwarrior_ databases, using
 a queryset API similar to that of Django's ORM.
 
-Supports Python 2.6, 2.7, 3.2, 3.3 and 3.4 with taskwarrior 2.1.x and above.
+Supports Python 2.7, and 3.4 - 3.8 with taskwarrior 2.1.x and above.
 Older versions of taskwarrior are untested and may not work.
 
 Requirements

docs/conf.py

@@ -51,9 +51,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.2.1'
+version = '1.3.0'
 # The full version, including alpha/beta/rc tags.
-release = '1.2.1'
+release = '1.3.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

docs/index.rst

@@ -4,7 +4,7 @@ Welcome to tasklib's documentation!
 tasklib is a Python library for interacting with taskwarrior_ databases, using
 a queryset API similar to that of Django's ORM.
 
-Supports Python 2.6, 2.7, 3.2, 3.3 and 3.4 with taskwarrior 2.1.x and above.
+Supports Python 2.7, 3.4 - 3.8 with taskwarrior 2.1.x and above.
 Older versions of taskwarrior are untested and may not work.
 
 Requirements

setup.py

@@ -2,7 +2,7 @@
 
 install_requirements = ['six>=1.4', 'pytz', 'tzlocal']
 
-version = '1.2.1'
+version = '1.3.0'
 
 try:
     import importlib

tasklib/backends.py

@@ -165,7 +165,7 @@ def add_field(field):
 
             # Empty values should not be enclosed in quotation marks, see
             # TW-1510
-            if serialized_value is '':
+            if serialized_value == '':
                 escaped_serialized_value = ''
             else:
                 escaped_serialized_value = six.u("'{0}'").format(

tasklib/lazy.py

@@ -19,7 +19,7 @@ def __init__(self, tw, uuid):
 
     def __getitem__(self, key):
         # LazyUUIDTask does not provide anything else other than 'uuid'
-        if key is 'uuid':
+        if key == 'uuid':
             return self._uuid
         else:
             self.replace()

tasklib/task.py

@@ -125,7 +125,7 @@ def export_data(self):
 
         # Empty string denotes empty serialized value, we do not want
         # to pass that to TaskWarrior.
-        data_tuples = filter(lambda t: t[1] is not '', data_tuples)
+        data_tuples = filter(lambda t: t[1] != '', data_tuples)
         data = dict(data_tuples)
         return json.dumps(data, separators=(',', ':'))
 
@@ -477,7 +477,7 @@ def __repr__(self):
 
     def __len__(self):
         if self._result_cache is None:
-            self._result_cache = list(self)
+            self._result_cache = list(self.__iter__())
         return len(self._result_cache)
 
     def __iter__(self):