From f3d5df2ce3addd9e9e1863f4f33665a16b415b71 Mon Sep 17 00:00:00 2001 From: Andreas Maier Date: Fri, 21 Oct 2016 11:11:22 +0200 Subject: Fixes to support Python 2.6 again. Details: - Added Python 2.6 again to .travis.yml (it was removed in commit 4486bcb). - Replaced the use of dictionary comprehensions in `git/cmd.py` around line 800 with the code before that change (in commit 25a2ebf). Reason: dict comprehensions were introduced only in Python 2.7. - Changed the import source for `SkipTest` and `skipIf` from `unittest.case` to first trying `unittest` and upon ImportError from `unittest2`. This was done in `git/util.py` and in several testcases. Reason: `SkipTest` and `skipIf` were introduced to unittest only in Python 2.7, and `unittest2` is a backport of `unittest` additions to Python 2.6. - In git/test/lib/helper.py, fixed the definition of `assertRaisesRegex` to work on py26. - For Python 2.6, added the `unittest2` dependency to `requirements.txt` and changed `.travis.yml` to install `unittest2`. Because git/util.py uses SkipTest from unittest/unittest2, the dependency could not be added to `test-requirements.txt`. - Fixed an assertion in `git/test/test_index.py` to also allow a Python 2.6 specific exception message. - In `is_cygwin_git()` in `git/util.py`, replaced `check_output()` with `Popen()`. It was added in Python 2.7. - Enabled Python 2.6 for Windows: - Added Python 2.6 for MINGW in .appveyor.yml. - When defining `PROC_CREATIONFLAGS` in `git/cmd.py`, made use of certain win32 and subprocess flags that were introduced in Python 2.7, dependent on whether we run on Python 2.7 or higher. - In `AutoInterrupt.__del__()` in `git/cmd.py`, allowed for `os` not having `kill()`. `os.kill()` was added for Windows in Python 2.7 (For Linux, it existed in Python 2.6 already). --- git/test/lib/helper.py | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'git/test/lib/helper.py') diff --git a/git/test/lib/helper.py b/git/test/lib/helper.py index 1515f2a1..743f720c 100644 --- a/git/test/lib/helper.py +++ b/git/test/lib/helper.py @@ -7,20 +7,24 @@ from __future__ import print_function import contextlib from functools import wraps +import sys import io import logging import os import tempfile import textwrap import time -from unittest import TestCase -import unittest -from git.compat import string_types, is_win, PY3 +from git.compat import string_types, is_win from git.util import rmtree, cwd import os.path as osp +if sys.version_info[0:2] == (2, 6): + import unittest2 as unittest +else: + import unittest +TestCase = unittest.TestCase ospd = osp.dirname @@ -335,8 +339,11 @@ class TestBase(TestCase): of the project history ( to assure tests don't fail for others ). """ - if not PY3: - assertRaisesRegex = unittest.TestCase.assertRaisesRegexp + # 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): + assertRaisesRegex = TestCase.assertRaisesRegexp def _small_repo_url(self): """:return" a path to a small, clonable repository""" -- cgit v1.2.1