Backport python 3 super() (#1733)

4 files changed, 9 insertions, 10 deletions

diff --git a/psutil/tests/__init__.py b/psutil/tests/__init__.py
index f3358806..d7dd42b2 100644
--- a/psutil/tests/__init__.py
+++ b/psutil/tests/__init__.py
@@ -41,16 +41,16 @@ from psutil import POSIX
 from psutil import SUNOS
 from psutil import WINDOWS
 from psutil._common import bytes2human
-from psutil._common import supports_ipv6
 from psutil._common import print_color
+from psutil._common import supports_ipv6
 from psutil._compat import ChildProcessError
 from psutil._compat import FileExistsError
 from psutil._compat import FileNotFoundError
 from psutil._compat import PY3
+from psutil._compat import range
 from psutil._compat import u
 from psutil._compat import unicode
 from psutil._compat import which
-from psutil._compat import xrange
 
 if sys.version_info < (2, 7):
     import unittest2 as unittest  # requires "pip install unittest2"
@@ -869,7 +869,7 @@ class TestMemoryLeak(unittest.TestCase):
         return (diff, ncalls)
 
     def _call_ntimes(self, fun, times):
-        return self._itercall(fun, xrange(times))[0]
+        return self._itercall(fun, range(times))[0]
 
     def _call_for(self, fun, secs):
         def iterator(secs):
diff --git a/psutil/tests/test_contracts.py b/psutil/tests/test_contracts.py
index 312f17d9..51ac3609 100755
--- a/psutil/tests/test_contracts.py
+++ b/psutil/tests/test_contracts.py
@@ -27,6 +27,7 @@ from psutil import POSIX
 from psutil import SUNOS
 from psutil import WINDOWS
 from psutil._compat import long
+from psutil._compat import range
 from psutil.tests import create_sockets
 from psutil.tests import enum
 from psutil.tests import get_kernel_version
@@ -620,7 +621,7 @@ class TestFetchAllProcesses(unittest.TestCase):
     def cpu_affinity(self, ret, proc):
         self.assertIsInstance(ret, list)
         assert ret != [], ret
-        cpus = range(psutil.cpu_count())
+        cpus = list(range(psutil.cpu_count()))
         for n in ret:
             self.assertIsInstance(n, int)
             self.assertIn(n, cpus)
diff --git a/psutil/tests/test_memory_leaks.py b/psutil/tests/test_memory_leaks.py
index b0b4af1b..3d37f35e 100755
--- a/psutil/tests/test_memory_leaks.py
+++ b/psutil/tests/test_memory_leaks.py
@@ -29,6 +29,7 @@ from psutil import POSIX
 from psutil import SUNOS
 from psutil import WINDOWS
 from psutil._compat import ProcessLookupError
+from psutil._compat import super
 from psutil.tests import CIRRUS
 from psutil.tests import create_sockets
 from psutil.tests import get_test_subprocess
@@ -283,7 +284,7 @@ class TestTerminatedProcessLeaks(TestProcessObjectLeaks):
 
     @classmethod
     def setUpClass(cls):
-        super(TestTerminatedProcessLeaks, cls).setUpClass()
+        super().setUpClass()
         p = get_test_subprocess()
         cls.proc = psutil.Process(p.pid)
         cls.proc.kill()
@@ -291,7 +292,7 @@ class TestTerminatedProcessLeaks(TestProcessObjectLeaks):
 
     @classmethod
     def tearDownClass(cls):
-        super(TestTerminatedProcessLeaks, cls).tearDownClass()
+        super().tearDownClass()
         reap_children()
 
     def _call(self, fun):
diff --git a/psutil/tests/test_misc.py b/psutil/tests/test_misc.py
index ca0a0433..74a0c427 100755
--- a/psutil/tests/test_misc.py
+++ b/psutil/tests/test_misc.py
@@ -42,7 +42,6 @@ from psutil.tests import reload_module
 from psutil.tests import ROOT_DIR
 from psutil.tests import SCRIPTS_DIR
 from psutil.tests import sh
-from psutil.tests import TOX
 from psutil.tests import TRAVIS
 from psutil.tests import unittest
 import psutil
@@ -624,9 +623,7 @@ class TestWrapNumbers(unittest.TestCase):
 # ===================================================================
 
 
-@unittest.skipIf(TOX, "can't test on TOX")
-# See: https://travis-ci.org/giampaolo/psutil/jobs/295224806
-@unittest.skipIf(TRAVIS and not os.path.exists(SCRIPTS_DIR),
+@unittest.skipIf(not os.path.exists(SCRIPTS_DIR),
                  "can't locate scripts directory")
 class TestScripts(unittest.TestCase):
     """Tests for scripts in the "scripts" directory."""