diff options
| author | Sebastian Thiel <byronimo@gmail.com> | 2018-03-24 13:45:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-24 13:45:17 +0100 |
| commit | f3265bd8beb017890699d093586126ff8af4a3fe (patch) | |
| tree | ccf02df66dbb979c7f6da6949456902a06aa1b1e /git/test/lib/helper.py | |
| parent | 9f12b26b81a8e7667b2a26a7878e5bc033610ed5 (diff) | |
| parent | 80b038f8d8c7c67c148ebd7a5f7a0cb39541b761 (diff) | |
| download | gitpython-f3265bd8beb017890699d093586126ff8af4a3fe.tar.gz | |
Merge pull request #737 from hugovk/rm-2.6
Drop support for EOL Python 2.6 and 3.3
Diffstat (limited to 'git/test/lib/helper.py')
| -rw-r--r-- | git/test/lib/helper.py | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/git/test/lib/helper.py b/git/test/lib/helper.py index cb46173d..1c06010f 100644 --- a/git/test/lib/helper.py +++ b/git/test/lib/helper.py @@ -15,6 +15,7 @@ import sys import tempfile import textwrap import time +import unittest from git.compat import string_types, is_win from git.util import rmtree, cwd @@ -23,11 +24,6 @@ import gitdb import os.path as osp -if sys.version_info[0:2] == (2, 6): - import unittest2 as unittest -else: - import unittest - TestCase = unittest.TestCase SkipTest = unittest.SkipTest skipIf = unittest.skipIf @@ -348,7 +344,6 @@ class TestBase(TestCase): of the project history ( to assure tests don't fail for others ). """ - # On py26, unittest2 has assertRaisesRegex # On py3, unittest has assertRaisesRegex # On py27, we use unittest, which names it differently: if sys.version_info[0:2] == (2, 7): |