diff options
author | kballou <kballou@devnulllabs.io> | 2015-04-10 17:42:28 -0600 |
---|---|---|
committer | kballou <kballou@devnulllabs.io> | 2015-04-10 18:10:19 -0600 |
commit | 1e582cbf9ca55bf03bf383b29b293fc87c9f0cc8 (patch) | |
tree | 37ceb354a1af5e9ebd14857707504f8e62688527 | |
parent | 48371a5841249980f102df4a8c9f41e541341cb6 (diff) | |
download | pylibchorus-1e582cbf9ca55bf03bf383b29b293fc87c9f0cc8.tar.gz pylibchorus-1e582cbf9ca55bf03bf383b29b293fc87c9f0cc8.tar.xz |
Use unittest2 when using python 2.6
-rw-r--r-- | pylibchorus/tests/chorus_client_tests.py | 6 | ||||
-rw-r--r-- | setup.py | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/pylibchorus/tests/chorus_client_tests.py b/pylibchorus/tests/chorus_client_tests.py index c36edcd..5103b70 100644 --- a/pylibchorus/tests/chorus_client_tests.py +++ b/pylibchorus/tests/chorus_client_tests.py @@ -8,7 +8,11 @@ from pylibchorus.chorus_api import _check_login_ from pylibchorus.chorus_api import _create_workfile_ from pylibchorus.chorus_api import _update_workfile_version_ from pylibchorus.chorus_api import _delete_workfile_ -import unittest +import sys +if sys.version_info[0] == 2 and sys.version_info[1] == 6: + import unittest2 as unittest +else: + import unittest LOG = logging.getLogger(__name__) @@ -39,6 +39,9 @@ setup( 'requests', 'setuptools', ], + tests_require=[ + 'unittest2', + ], classifiers=[ 'Development Status :: 2 - Pre-Alpha', 'Environment :: Console', |