summaryrefslogtreecommitdiff
path: root/git/test/test_submodule.py
diff options
context:
space:
mode:
authorSebastian Thiel <byronimo@gmail.com>2016-12-08 13:20:52 +0100
committerGitHub <noreply@github.com>2016-12-08 13:20:52 +0100
commit2f207e0e15ad243dd24eafce8b60ed2c77d6e725 (patch)
tree9460e9e1178c21389386e49e336550093d34448b /git/test/test_submodule.py
parenta8437c014b0a9872168b01790f5423e8e9255840 (diff)
parentf3d5df2ce3addd9e9e1863f4f33665a16b415b71 (diff)
downloadgitpython-2f207e0e15ad243dd24eafce8b60ed2c77d6e725.tar.gz
Merge pull request #541 from andy-maier/py26_fixes
Fixes to support Python 2.6 again.
Diffstat (limited to 'git/test/test_submodule.py')
-rw-r--r--git/test/test_submodule.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/git/test/test_submodule.py b/git/test/test_submodule.py
index 95441813..0a6c4880 100644
--- a/git/test/test_submodule.py
+++ b/git/test/test_submodule.py
@@ -3,7 +3,10 @@
# the BSD License: http://www.opensource.org/licenses/bsd-license.php
import os
import sys
-from unittest.case import skipIf
+try:
+ from unittest import skipIf
+except ImportError:
+ from unittest2 import skipIf
import git
from git.cmd import Git