diff options
| author | Sebastian Thiel <byronimo@gmail.com> | 2016-12-08 13:20:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-08 13:20:52 +0100 |
| commit | 2f207e0e15ad243dd24eafce8b60ed2c77d6e725 (patch) | |
| tree | 9460e9e1178c21389386e49e336550093d34448b /git/test/test_repo.py | |
| parent | a8437c014b0a9872168b01790f5423e8e9255840 (diff) | |
| parent | f3d5df2ce3addd9e9e1863f4f33665a16b415b71 (diff) | |
| download | gitpython-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_repo.py')
| -rw-r--r-- | git/test/test_repo.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/git/test/test_repo.py b/git/test/test_repo.py index 374a26ee..9ad80ee6 100644 --- a/git/test/test_repo.py +++ b/git/test/test_repo.py @@ -11,7 +11,10 @@ import os import pickle import sys import tempfile -from unittest.case import skipIf +try: + from unittest import skipIf, SkipTest +except ImportError: + from unittest2 import skipIf, SkipTest from git import ( InvalidGitRepositoryError, @@ -53,7 +56,6 @@ from git.test.lib import ( from git.util import HIDE_WINDOWS_KNOWN_ERRORS, cygpath from git.test.lib import with_rw_directory from git.util import join_path_native, rmtree, rmfile, bin_to_hex -from unittest import SkipTest import functools as fnt import os.path as osp |