Fix incompatibility with python2.6, where unittest doesn't provide skipIf.

Signed-off-by: Jelmer Vernooij <jelmer@samba.org>

dulwich/tests/__init__.py

@@ -30,9 +30,9 @@ import tempfile
 # If Python itself provides an exception, use that
 import unittest
 if sys.version_info < (2, 7):
-    from unittest2 import SkipTest, TestCase as _TestCase
+    from unittest2 import SkipTest, TestCase as _TestCase, skipIf
 else:
-    from unittest import SkipTest, TestCase as _TestCase
+    from unittest import SkipTest, TestCase as _TestCase, skipIf
 
 
 def get_safe_env(env=None):

dulwich/tests/utils.py

@@ -28,10 +28,6 @@ import tempfile
 import time
 import types
 
-from unittest import (
-    SkipTest,
-    skipIf,
-    )
 import warnings
 
 from dulwich.index import (
@@ -52,7 +48,10 @@ from dulwich.pack import (
     create_delta,
     )
 from dulwich.repo import Repo
-from dulwich.tests import SkipTest
+from dulwich.tests import (
+    SkipTest,
+    skipIf,
+    )
 
 
 # Plain files are very frequently used in tests, so let the mode be very short.