Drop Python 2.6 support (#2099)

Signed-off-by: Hugo van Kemenade <hugovk@users.noreply.github.com>

16 files changed, 21 insertions, 20 deletions

diff --git a/psutil/tests/__init__.py b/psutil/tests/__init__.py
index 0d0e00df..82e08963 100644
--- a/psutil/tests/__init__.py
+++ b/psutil/tests/__init__.py
@@ -31,6 +31,7 @@ import tempfile
 import textwrap
 import threading
 import time
+import unittest
 import warnings
 from socket import AF_INET
 from socket import AF_INET6
@@ -57,11 +58,6 @@ from psutil._compat import unicode
 from psutil._compat import which
 
 
-if PY3:
-    import unittest
-else:
-    import unittest2 as unittest  # requires "pip install unittest2"
-
 try:
     from unittest import mock  # py3
 except ImportError:
@@ -862,6 +858,11 @@ class TestCase(unittest.TestCase):
         def runTest(self):
             pass
 
+        @contextlib.contextmanager
+        def subTest(self, *args, **kw):
+            # fake it for python 2.7
+            yield
+
 
 # monkey patch default unittest.TestCase
 unittest.TestCase = TestCase
diff --git a/psutil/tests/test_aix.py b/psutil/tests/test_aix.py
index 6a5debfa..4a23b774 100755
--- a/psutil/tests/test_aix.py
+++ b/psutil/tests/test_aix.py
@@ -9,12 +9,12 @@
 """AIX specific tests."""
 
 import re
+import unittest
 
 import psutil
 from psutil import AIX
 from psutil.tests import PsutilTestCase
 from psutil.tests import sh
-from psutil.tests import unittest
 
 
 @unittest.skipIf(not AIX, "AIX only")
diff --git a/psutil/tests/test_bsd.py b/psutil/tests/test_bsd.py
index 1ae810f1..a236810d 100755
--- a/psutil/tests/test_bsd.py
+++ b/psutil/tests/test_bsd.py
@@ -14,6 +14,7 @@ import datetime
 import os
 import re
 import time
+import unittest
 
 import psutil
 from psutil import BSD
@@ -27,7 +28,6 @@ from psutil.tests import retry_on_failure
 from psutil.tests import sh
 from psutil.tests import spawn_testproc
 from psutil.tests import terminate
-from psutil.tests import unittest
 from psutil.tests import which
 
 
diff --git a/psutil/tests/test_connections.py b/psutil/tests/test_connections.py
index 5381608a..f3b1f837 100755
--- a/psutil/tests/test_connections.py
+++ b/psutil/tests/test_connections.py
@@ -9,6 +9,7 @@
 import os
 import socket
 import textwrap
+import unittest
 from contextlib import closing
 from socket import AF_INET
 from socket import AF_INET6
@@ -39,7 +40,6 @@ from psutil.tests import retry_on_failure
 from psutil.tests import serialrun
 from psutil.tests import skip_on_access_denied
 from psutil.tests import tcp_socketpair
-from psutil.tests import unittest
 from psutil.tests import unix_socketpair
 from psutil.tests import wait_for_file
 
diff --git a/psutil/tests/test_contracts.py b/psutil/tests/test_contracts.py
index 9def408a..5c927d68 100755
--- a/psutil/tests/test_contracts.py
+++ b/psutil/tests/test_contracts.py
@@ -17,6 +17,7 @@ import stat
 import sys
 import time
 import traceback
+import unittest
 
 import psutil
 from psutil import AIX
@@ -51,7 +52,6 @@ from psutil.tests import is_namedtuple
 from psutil.tests import kernel_version
 from psutil.tests import process_namespace
 from psutil.tests import serialrun
-from psutil.tests import unittest
 
 
 # ===================================================================
diff --git a/psutil/tests/test_linux.py b/psutil/tests/test_linux.py
index 0d42d051..8dd4caae 100755
--- a/psutil/tests/test_linux.py
+++ b/psutil/tests/test_linux.py
@@ -20,6 +20,7 @@ import socket
 import struct
 import textwrap
 import time
+import unittest
 import warnings
 
 import psutil
@@ -46,7 +47,6 @@ from psutil.tests import retry_on_failure
 from psutil.tests import safe_rmpath
 from psutil.tests import sh
 from psutil.tests import skip_on_not_implemented
-from psutil.tests import unittest
 from psutil.tests import which
 
 
diff --git a/psutil/tests/test_memleaks.py b/psutil/tests/test_memleaks.py
index d5baffa5..e507e837 100755
--- a/psutil/tests/test_memleaks.py
+++ b/psutil/tests/test_memleaks.py
@@ -19,6 +19,7 @@ from __future__ import print_function
 
 import functools
 import os
+import unittest
 
 import psutil
 import psutil._common
@@ -50,7 +51,6 @@ from psutil.tests import skip_on_access_denied
 from psutil.tests import spawn_testproc
 from psutil.tests import system_namespace
 from psutil.tests import terminate
-from psutil.tests import unittest
 
 
 cext = psutil._psplatform.cext
diff --git a/psutil/tests/test_misc.py b/psutil/tests/test_misc.py
index aa30cbd6..add9646e 100755
--- a/psutil/tests/test_misc.py
+++ b/psutil/tests/test_misc.py
@@ -17,6 +17,7 @@ import os
 import pickle
 import socket
 import stat
+import unittest
 
 import psutil
 import psutil.tests
@@ -51,7 +52,6 @@ from psutil.tests import import_module_by_path
 from psutil.tests import mock
 from psutil.tests import reload_module
 from psutil.tests import sh
-from psutil.tests import unittest
 
 
 # ===================================================================
diff --git a/psutil/tests/test_osx.py b/psutil/tests/test_osx.py
index 4f4b1c29..d0f588ad 100755
--- a/psutil/tests/test_osx.py
+++ b/psutil/tests/test_osx.py
@@ -8,6 +8,7 @@
 
 import re
 import time
+import unittest
 
 import psutil
 from psutil import MACOS
@@ -20,7 +21,6 @@ from psutil.tests import retry_on_failure
 from psutil.tests import sh
 from psutil.tests import spawn_testproc
 from psutil.tests import terminate
-from psutil.tests import unittest
 
 
 if POSIX:
diff --git a/psutil/tests/test_posix.py b/psutil/tests/test_posix.py
index edef7e7d..ebbf7a6e 100755
--- a/psutil/tests/test_posix.py
+++ b/psutil/tests/test_posix.py
@@ -13,6 +13,7 @@ import os
 import re
 import subprocess
 import time
+import unittest
 
 import psutil
 from psutil import AIX
@@ -32,7 +33,6 @@ from psutil.tests import sh
 from psutil.tests import skip_on_access_denied
 from psutil.tests import spawn_testproc
 from psutil.tests import terminate
-from psutil.tests import unittest
 from psutil.tests import which
 
 
diff --git a/psutil/tests/test_process.py b/psutil/tests/test_process.py
index ef96e797..eb17e239 100755
--- a/psutil/tests/test_process.py
+++ b/psutil/tests/test_process.py
@@ -19,6 +19,7 @@ import sys
 import textwrap
 import time
 import types
+import unittest
 
 import psutil
 from psutil import AIX
@@ -62,7 +63,6 @@ from psutil.tests import retry_on_failure
 from psutil.tests import sh
 from psutil.tests import skip_on_access_denied
 from psutil.tests import skip_on_not_implemented
-from psutil.tests import unittest
 from psutil.tests import wait_for_pid
 
 
diff --git a/psutil/tests/test_sunos.py b/psutil/tests/test_sunos.py
index ad94f774..dd74a49b 100755
--- a/psutil/tests/test_sunos.py
+++ b/psutil/tests/test_sunos.py
@@ -7,12 +7,12 @@
 """Sun OS specific tests."""
 
 import os
+import unittest
 
 import psutil
 from psutil import SUNOS
 from psutil.tests import PsutilTestCase
 from psutil.tests import sh
-from psutil.tests import unittest
 
 
 @unittest.skipIf(not SUNOS, "SUNOS only")
diff --git a/psutil/tests/test_system.py b/psutil/tests/test_system.py
index bb5edd5c..e130c935 100755
--- a/psutil/tests/test_system.py
+++ b/psutil/tests/test_system.py
@@ -16,6 +16,7 @@ import signal
 import socket
 import sys
 import time
+import unittest
 
 import psutil
 from psutil import AIX
@@ -50,7 +51,6 @@ from psutil.tests import check_net_address
 from psutil.tests import enum
 from psutil.tests import mock
 from psutil.tests import retry_on_failure
-from psutil.tests import unittest
 
 
 # ===================================================================
diff --git a/psutil/tests/test_testutils.py b/psutil/tests/test_testutils.py
index 89888dfe..dd98538c 100755
--- a/psutil/tests/test_testutils.py
+++ b/psutil/tests/test_testutils.py
@@ -16,6 +16,7 @@ import os
 import socket
 import stat
 import subprocess
+import unittest
 
 import psutil
 import psutil.tests
@@ -48,7 +49,6 @@ from psutil.tests import serialrun
 from psutil.tests import system_namespace
 from psutil.tests import tcp_socketpair
 from psutil.tests import terminate
-from psutil.tests import unittest
 from psutil.tests import unix_socketpair
 from psutil.tests import wait_for_file
 from psutil.tests import wait_for_pid
diff --git a/psutil/tests/test_unicode.py b/psutil/tests/test_unicode.py
index e6357269..3fa3f017 100755
--- a/psutil/tests/test_unicode.py
+++ b/psutil/tests/test_unicode.py
@@ -76,6 +76,7 @@ etc.) and make sure that:
 import os
 import shutil
 import traceback
+import unittest
 import warnings
 from contextlib import closing
 
@@ -108,7 +109,6 @@ from psutil.tests import serialrun
 from psutil.tests import skip_on_access_denied
 from psutil.tests import spawn_testproc
 from psutil.tests import terminate
-from psutil.tests import unittest
 
 
 if APPVEYOR:
diff --git a/psutil/tests/test_windows.py b/psutil/tests/test_windows.py
index 0333dbe5..b89c67a9 100755
--- a/psutil/tests/test_windows.py
+++ b/psutil/tests/test_windows.py
@@ -17,6 +17,7 @@ import signal
 import subprocess
 import sys
 import time
+import unittest
 import warnings
 
 import psutil
@@ -36,7 +37,6 @@ from psutil.tests import retry_on_failure
 from psutil.tests import sh
 from psutil.tests import spawn_testproc
 from psutil.tests import terminate
-from psutil.tests import unittest
 
 
 if WINDOWS and not PYPY: