From: Tomas Babej Date: Sun, 9 Aug 2015 12:59:02 +0000 (+0200) Subject: Merge branch 'fixes' of github.com:/tshirtman/tasklib into develop X-Git-Url: https://git.madduck.net/etc/taskwarrior.git/commitdiff_plain/ff666e5453d71418ca45ee0542a82e2c58ef8442?hp=a8a458c71b1a1f6e23fb734da35c349b14f5c462 Merge branch 'fixes' of github.com:/tshirtman/tasklib into develop --- diff --git a/setup.py b/setup.py index a275915..27e369f 100644 --- 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 e69de29..ed3e731 100644 --- 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 00b2210..32a8018 100644 --- 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 c40a3c7..f30cc61 100644 --- 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)