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

…ipIf. Signed-off-by: Jelmer Vernooij <jelmer@samba.org>
MrJohz · Nov 8, 2014 · 5a525e7 · 5a525e7
1 parent 058b3e9
commit 5a525e7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/dulwich/tests/__init__.py b/dulwich/tests/__init__.py
@@ -30,9 +30,9 @@
 # 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):

diff --git a/dulwich/tests/utils.py b/dulwich/tests/utils.py
@@ -28,10 +28,6 @@
 import time
 import types
 
-from unittest import (
-    SkipTest,
-    skipIf,
-    )
 import warnings
 
 from dulwich.index import (
@@ -52,7 +48,10 @@
     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.