Merge branch 'fixes' of github.com:/tshirtman/tasklib into develop

diff --git a/setup.py b/setup.py
index a275915416c2327702a79f7f3769010a5f3dd41b..27e369f5dc7a35b4acab4035aa648a42d8a99b0b 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,14 @@
 from setuptools import setup, find_packages
 
+install_requirements = ['six==1.5.2', 'pytz', 'tzlocal']
+
 version = '0.10.0'
 
+try:
+    import importlib
+except ImportError:
+    install_requirements.append('importlib')
+
 setup(
     name='tasklib',
     version=version,
@@ -15,7 +22,7 @@ setup(
     packages=find_packages(),
     include_package_data=True,
     test_suite='tasklib.tests',
-    install_requires=['six==1.5.2', 'pytz', 'tzlocal'],
+    install_requires=install_requirements,
     classifiers=[
         'Development Status :: 4 - Beta',
         'Programming Language :: Python',

diff --git a/tasklib/__init__.py b/tasklib/__init__.py
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..ed3e73181a58b27934a3d4680fc94616ee01fd22 100644 (file)
--- a/tasklib/__init__.py
+++ b/tasklib/__init__.py
@@ -0,0 +1,3 @@
+from .backends import TaskWarrior
+from .task import Task
+from .serializing import local_zone

diff --git a/tasklib/backends.py b/tasklib/backends.py
index 00b2210b708b9be485a2e499db240975d17f3169..32a8018acb142ddb1257e0fe3916089bde2ecf70 100644 (file)
--- a/tasklib/backends.py
+++ b/tasklib/backends.py
@@ -1,4 +1,5 @@
 import abc
+import copy
 import datetime
 import json
 import logging

diff --git a/tasklib/task.py b/tasklib/task.py
index c40a3c7b0445b29d24ba0224dabcbe67e9d35699..f30cc617cf9571b4e451b62c713c13094ae6861d 100644 (file)
--- a/tasklib/task.py
+++ b/tasklib/task.py
@@ -223,7 +223,7 @@ class Task(TaskResource):
 
         # Create the TaskWarrior instance if none passed
         if backend is None:
-            backends = importlib.import_module('.backends')
+            backends = importlib.import_module('tasklib.backends')
             hook_parent_dir = os.path.dirname(os.path.dirname(sys.argv[0]))
             backend = backends.TaskWarrior(data_location=hook_parent_dir)