diff --git a/test/units/compat/unittest.py b/test/units/compat/unittest.py index 77bb4c054cf..b4167741761 100644 --- a/test/units/compat/unittest.py +++ b/test/units/compat/unittest.py @@ -19,24 +19,11 @@ from __future__ import (absolute_import, division, print_function) __metaclass__ = type -''' -Compat module for Python2.7's unittest module -''' - -import sys - # Allow wildcard import because we really do want to import all of # unittests's symbols into this compat shim # pylint: disable=wildcard-import,unused-wildcard-import -if sys.version_info < (2, 7): - try: - # Need unittest2 on python2.6 - from unittest2 import * - except ImportError: - print('You need unittest2 installed on python2.6.x to run tests') -else: - from unittest import * +from unittest import * - if not hasattr(TestCase, 'assertRaisesRegex'): - # added in Python 3.2 - TestCase.assertRaisesRegex = TestCase.assertRaisesRegexp +if not hasattr(TestCase, 'assertRaisesRegex'): + # added in Python 3.2 + TestCase.assertRaisesRegex = TestCase.assertRaisesRegexp diff --git a/test/units/requirements.txt b/test/units/requirements.txt index 76f3baa35e3..f25bf30a687 100644 --- a/test/units/requirements.txt +++ b/test/units/requirements.txt @@ -2,4 +2,3 @@ bcrypt ; python_version >= '3.8' # controller only passlib ; python_version >= '3.8' # controller only pexpect ; python_version >= '3.8' # controller only pywinrm ; python_version >= '3.8' # controller only -unittest2 ; python_version < '2.7'