Use unittest2 for Python < 2.7

.travis.yml

@@ -5,7 +5,12 @@ python:
     - 2.7
     - 3.2
 install:
-    - if [[ $TRAVIS_PYTHON_VERSION == '2.5' ]]; then pip install --use-mirrors simplejson; fi
+    - if [[ $TRAVIS_PYTHON_VERSION == '2.5' ]]; then
+      pip install --use-mirrors simplejson unittest2;
+      fi
+    - if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then
+      pip install --use-mirrors unittest2;
+      fi
     - pip install --use-mirrors nose
 script:
     - cd test

test/base.py

@@ -1,7 +1,9 @@
-import unittest
-
 import time
 import sys
+if sys.hexversion < 0x02070000:
+    import unittest2 as unittest
+else:
+    import unittest
 import os
 from os.path import abspath, dirname
 import functools

test/regression.py

@@ -5,14 +5,13 @@ Unit tests to avoid errors of the past. Makes use of Python's ``unittest``
 module.
 """
 
-import unittest
 import time
 import functools
 import itertools
 import os
 import textwrap
 
-from base import TestBase, cwd_at
+from base import TestBase, unittest, cwd_at
 
 import jedi
 from jedi._compatibility import is_py25, utf8, unicode
@@ -130,11 +129,7 @@ class TestRegression(TestBase):
         defs = self.definition_when_in_function_call('f( ', ')')
         desc = defs[0].description
         if desc == 'keyword )':
-            try:
-                self.skipTest('finding definition at ``f( |)`` does not work')
-            except AttributeError:
-                # old unittest does not support skip
-                pass
+            self.skipTest('finding definition at ``f( |)`` does not work')
         else:
             self.assertEqual(desc, 'def f')
 

tox.ini

@@ -14,4 +14,9 @@ changedir = test
 [testenv:py25]
 deps =
     simplejson
+    unittest2
+    {[testenv]deps}
+[testenv:py26]
+deps =
+    unittest2
     {[testenv]deps}