Merge pull request #737 from hugovk/rm-2.6

Drop support for EOL Python 2.6 and 3.3

1 files changed, 2 insertions, 11 deletions

diff --git a/git/test/test_repo.py b/git/test/test_repo.py
index 2c3ad957..97eac4ae 100644
--- a/git/test/test_repo.py
+++ b/git/test/test_repo.py
@@ -9,12 +9,8 @@ from io import BytesIO
 import itertools
 import os
 import pickle
-import sys
 import tempfile
-try:
-    from unittest import skipIf, SkipTest
-except ImportError:
-    from unittest2 import skipIf, SkipTest
+from unittest import skipIf, SkipTest
 
 try:
     import pathlib
@@ -364,9 +360,6 @@ class TestRepo(TestBase):
 
     @patch.object(Git, '_call_process')
     def test_should_display_blame_information(self, git):
-        if sys.version_info < (2, 7):
-            ## Skipped, not `assertRaisesRegexp` in py2.6
-            return
         git.return_value = fixture('blame')
         b = self.rorepo.blame('master', 'lib/git.py')
         assert_equal(13, len(b))
@@ -522,7 +515,7 @@ class TestRepo(TestBase):
         # this is only a preliminary test, more testing done in test_index
         self.assertEqual(self.rorepo, self.rorepo)
         self.assertFalse(self.rorepo != self.rorepo)
-        self.assertEqual(len(set((self.rorepo, self.rorepo))), 1)
+        self.assertEqual(len({self.rorepo, self.rorepo}), 1)
 
     @with_rw_directory
     def test_tilde_and_env_vars_in_repo_path(self, rw_dir):
@@ -792,8 +785,6 @@ class TestRepo(TestBase):
 
     def test_repo_odbtype(self):
         target_type = GitCmdObjectDB
-        if sys.version_info[:2] < (2, 5):
-            target_type = GitCmdObjectDB
         self.assertIsInstance(self.rorepo.odb, target_type)
 
     def test_submodules(self):