summaryrefslogtreecommitdiff
path: root/git/test/test_submodule.py
diff options
context:
space:
mode:
authorSebastian Thiel <byronimo@gmail.com>2018-03-24 13:45:17 +0100
committerGitHub <noreply@github.com>2018-03-24 13:45:17 +0100
commitf3265bd8beb017890699d093586126ff8af4a3fe (patch)
treeccf02df66dbb979c7f6da6949456902a06aa1b1e /git/test/test_submodule.py
parent9f12b26b81a8e7667b2a26a7878e5bc033610ed5 (diff)
parent80b038f8d8c7c67c148ebd7a5f7a0cb39541b761 (diff)
downloadgitpython-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/test_submodule.py')
-rw-r--r--git/test/test_submodule.py7
1 files changed, 2 insertions, 5 deletions
diff --git a/git/test/test_submodule.py b/git/test/test_submodule.py
index 5c8a2798..0bf76380 100644
--- a/git/test/test_submodule.py
+++ b/git/test/test_submodule.py
@@ -3,10 +3,7 @@
# the BSD License: http://www.opensource.org/licenses/bsd-license.php
import os
import sys
-try:
- from unittest import skipIf
-except ImportError:
- from unittest2 import skipIf
+from unittest import skipIf
import git
from git.cmd import Git
@@ -267,7 +264,7 @@ class TestSubmodule(TestBase):
self.failUnlessRaises(ValueError, csm.remove, module=False, configuration=False)
# module() is supposed to point to gitdb, which has a child-submodule whose URL is still pointing
- # to github. To save time, we will change it to
+ # to GitHub. To save time, we will change it to
csm.set_parent_commit(csm.repo.head.commit)
with csm.config_writer() as cw:
cw.set_value('url', self._small_repo_url())