datetime_tz isn't readily available, so it's a lot easier to just package it within the nilmdb tree.tags/nilmdb-0.2^2
@@ -7,3 +7,4 @@ | |||||
exclude_lines = | exclude_lines = | ||||
pragma: no cover | pragma: no cover | ||||
if 0: | if 0: | ||||
omit = nilmdb/utils/datetime_tz* |
@@ -2,8 +2,8 @@ | |||||
import nilmdb | import nilmdb | ||||
from nilmdb.utils.printf import * | from nilmdb.utils.printf import * | ||||
from nilmdb.utils import datetime_tz | |||||
import datetime_tz | |||||
import dateutil.parser | import dateutil.parser | ||||
import sys | import sys | ||||
import re | import re | ||||
@@ -1,10 +1,10 @@ | |||||
"""File-like objects that add timestamps to the input lines""" | """File-like objects that add timestamps to the input lines""" | ||||
from nilmdb.utils.printf import * | from nilmdb.utils.printf import * | ||||
from nilmdb.utils import datetime_tz | |||||
import time | import time | ||||
import os | import os | ||||
import datetime_tz | |||||
class Timestamper(object): | class Timestamper(object): | ||||
"""A file-like object that adds timestamps to lines of an input file.""" | """A file-like object that adds timestamps to lines of an input file.""" | ||||
@@ -32,7 +32,6 @@ setup(name='nilmdb', | |||||
], | ], | ||||
install_requires = [ 'distribute', | install_requires = [ 'distribute', | ||||
'decorator', | 'decorator', | ||||
'datetime_tz', | |||||
], | ], | ||||
packages = [ 'nilmdb', | packages = [ 'nilmdb', | ||||
'nilmdb.utils', | 'nilmdb.utils', | ||||
@@ -4,8 +4,7 @@ import nilmdb | |||||
from nilmdb.utils.printf import * | from nilmdb.utils.printf import * | ||||
from nilmdb.utils import timestamper | from nilmdb.utils import timestamper | ||||
from nilmdb.client import ClientError, ServerError | from nilmdb.client import ClientError, ServerError | ||||
import datetime_tz | |||||
from nilmdb.utils import datetime_tz | |||||
from nose.tools import * | from nose.tools import * | ||||
from nose.tools import assert_raises | from nose.tools import assert_raises | ||||
@@ -3,12 +3,12 @@ | |||||
import nilmdb | import nilmdb | ||||
from nilmdb.utils.printf import * | from nilmdb.utils.printf import * | ||||
import nilmdb.cmdline | import nilmdb.cmdline | ||||
from nilmdb.utils import datetime_tz | |||||
import unittest | import unittest | ||||
from nose.tools import * | from nose.tools import * | ||||
from nose.tools import assert_raises | from nose.tools import assert_raises | ||||
import itertools | import itertools | ||||
import datetime_tz | |||||
import os | import os | ||||
import re | import re | ||||
import shutil | import shutil | ||||
@@ -2,7 +2,7 @@ | |||||
import nilmdb | import nilmdb | ||||
from nilmdb.utils.printf import * | from nilmdb.utils.printf import * | ||||
import datetime_tz | |||||
from nilmdb.utils import datetime_tz | |||||
from nose.tools import * | from nose.tools import * | ||||
from nose.tools import assert_raises | from nose.tools import assert_raises | ||||
@@ -1,7 +1,6 @@ | |||||
import nilmdb | import nilmdb | ||||
from nilmdb.utils.printf import * | from nilmdb.utils.printf import * | ||||
import datetime_tz | |||||
from nilmdb.utils import datetime_tz | |||||
from nose.tools import * | from nose.tools import * | ||||
from nose.tools import assert_raises | from nose.tools import assert_raises | ||||