Improve compatibility with Python 2.6.

3 files changed, 14 insertions, 5 deletions

diff --git a/setup.py b/setup.py
index 00882de..02e5a71 100644
--- a/setup.py
+++ b/setup.py
@@ -62,6 +62,7 @@ setup(
         'Natural Language :: English',
         'Programming Language :: Python',
         'Programming Language :: Python :: 2',
+        'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3.2',
         'Programming Language :: Python :: 3.3',
diff --git a/tests/test_times.py b/tests/test_times.py
index b887c3d..f308475 100644
--- a/tests/test_times.py
+++ b/tests/test_times.py
@@ -1,10 +1,13 @@
-from unittest import TestCase
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest  # noqa
 import times
 import pytz
 from datetime import datetime
 
 
-class TestTimes(TestCase):
+class TestTimes(unittest.TestCase):
     def setUp(self):
         est = pytz.timezone('EST')
         ams = pytz.timezone('Europe/Amsterdam')
diff --git a/tox.ini b/tox.ini
index 21cb45f..c7082c9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,11 @@
 [tox]
-envlist = py27, py32, pypy
+envlist = py26,py27,py32,py33,pypy
 
 [testenv]
-deps=nose
-commands=nosetests
+deps=pytest
+commands=py.test
+
+[testenv:py26]
+deps=
+    pytest
+    unittest2