py2docfx 0.1.11rc1981066__py3-none-any.whl → 0.1.11rc1997820__py3-none-any.whl

py2docfx/venv/venv1/Lib/site-packages/psutil/tests/test_linux.py

@@ -6,13 +6,13 @@
 
 """Linux specific tests."""
 
-from __future__ import division
 
 import collections
 import contextlib
 import errno
 import io
 import os
+import platform
 import re
 import shutil
 import socket
@@ -20,12 +20,10 @@ import struct
 import textwrap
 import time
 import warnings
+from unittest import mock
 
 import psutil
 from psutil import LINUX
-from psutil._compat import PY3
-from psutil._compat import FileNotFoundError
-from psutil._compat import basestring
 from psutil.tests import AARCH64
 from psutil.tests import GITHUB_ACTIONS
 from psutil.tests import GLOBAL_TIMEOUT
@@ -35,20 +33,17 @@ from psutil.tests import HAS_GETLOADAVG
 from psutil.tests import HAS_RLIMIT
 from psutil.tests import PYPY
 from psutil.tests import PYTEST_PARALLEL
-from psutil.tests import QEMU_USER
 from psutil.tests import TOLERANCE_DISK_USAGE
 from psutil.tests import TOLERANCE_SYS_MEM
 from psutil.tests import PsutilTestCase
 from psutil.tests import ThreadTask
 from psutil.tests import call_until
-from psutil.tests import mock
 from psutil.tests import pytest
 from psutil.tests import reload_module
 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 which
 
 
 if LINUX:
@@ -73,11 +68,8 @@ if LINUX:
 def get_ipv4_address(ifname):
     import fcntl
 
-    ifname = ifname[:15]
-    if PY3:
-        ifname = bytes(ifname, 'ascii')
-    s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
-    with contextlib.closing(s):
+    ifname = bytes(ifname[:15], "ascii")
+    with socket.socket(socket.AF_INET, socket.SOCK_DGRAM) as s:
         return socket.inet_ntoa(
             fcntl.ioctl(s.fileno(), SIOCGIFADDR, struct.pack('256s', ifname))[
                 20:24
@@ -88,11 +80,8 @@ def get_ipv4_address(ifname):
 def get_ipv4_netmask(ifname):
     import fcntl
 
-    ifname = ifname[:15]
-    if PY3:
-        ifname = bytes(ifname, 'ascii')
-    s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
-    with contextlib.closing(s):
+    ifname = bytes(ifname[:15], "ascii")
+    with socket.socket(socket.AF_INET, socket.SOCK_DGRAM) as s:
         return socket.inet_ntoa(
             fcntl.ioctl(
                 s.fileno(), SIOCGIFNETMASK, struct.pack('256s', ifname)
@@ -103,11 +92,8 @@ def get_ipv4_netmask(ifname):
 def get_ipv4_broadcast(ifname):
     import fcntl
 
-    ifname = ifname[:15]
-    if PY3:
-        ifname = bytes(ifname, 'ascii')
-    s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
-    with contextlib.closing(s):
+    ifname = bytes(ifname[:15], "ascii")
+    with socket.socket(socket.AF_INET, socket.SOCK_DGRAM) as s:
         return socket.inet_ntoa(
             fcntl.ioctl(
                 s.fileno(), SIOCGIFBRDADDR, struct.pack('256s', ifname)
@@ -124,13 +110,13 @@ def get_ipv6_addresses(ifname):
                 all_fields.append(fields)
 
         if len(all_fields) == 0:
-            raise ValueError("could not find interface %r" % ifname)
+            raise ValueError(f"could not find interface {ifname!r}")
 
     for i in range(len(all_fields)):
         unformatted = all_fields[i][0]
-        groups = []
-        for j in range(0, len(unformatted), 4):
-            groups.append(unformatted[j : j + 4])
+        groups = [
+            unformatted[j : j + 4] for j in range(0, len(unformatted), 4)
+        ]
         formatted = ":".join(groups)
         packed = socket.inet_pton(socket.AF_INET6, formatted)
         all_fields[i] = socket.inet_ntop(socket.AF_INET6, packed)
@@ -140,24 +126,12 @@ def get_ipv6_addresses(ifname):
 def get_mac_address(ifname):
     import fcntl
 
-    ifname = ifname[:15]
-    if PY3:
-        ifname = bytes(ifname, 'ascii')
-    s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
-    with contextlib.closing(s):
+    ifname = bytes(ifname[:15], "ascii")
+    with socket.socket(socket.AF_INET, socket.SOCK_DGRAM) as s:
         info = fcntl.ioctl(
             s.fileno(), SIOCGIFHWADDR, struct.pack('256s', ifname)
         )
-        if PY3:
-
-            def ord(x):
-                return x
-
-        else:
-            import __builtin__
-
-            ord = __builtin__.ord
-        return ''.join(['%02x:' % ord(char) for char in info[18:24]])[:-1]
+        return "".join([f"{char:02x}:" for char in info[18:24]])[:-1]
 
 
 def free_swap():
@@ -171,9 +145,7 @@ def free_swap():
             _, total, used, free = line.split()
             nt = collections.namedtuple('free', 'total used free')
             return nt(int(total), int(used), int(free))
-    raise ValueError(
-        "can't find 'Swap' in 'free' output:\n%s" % '\n'.join(lines)
-    )
+    raise ValueError(f"can't find 'Swap' in 'free' output:\n{out}")
 
 
 def free_physmem():
@@ -193,9 +165,7 @@ def free_physmem():
                 'free', 'total used free shared output'
             )
             return nt(total, used, free, shared, out)
-    raise ValueError(
-        "can't find 'Mem' in 'free' output:\n%s" % '\n'.join(lines)
-    )
+    raise ValueError(f"can't find 'Mem' in 'free' output:\n{out}")
 
 
 def vmstat(stat):
@@ -204,7 +174,7 @@ def vmstat(stat):
         line = line.strip()
         if stat in line:
             return int(line.split(' ')[0])
-    raise ValueError("can't find %r in 'vmstat' output" % stat)
+    raise ValueError(f"can't find {stat!r} in 'vmstat' output")
 
 
 def get_free_version_info():
@@ -223,19 +193,15 @@ def mock_open_content(pairs):
     def open_mock(name, *args, **kwargs):
         if name in pairs:
             content = pairs[name]
-            if PY3:
-                if isinstance(content, basestring):
-                    return io.StringIO(content)
-                else:
-                    return io.BytesIO(content)
+            if isinstance(content, str):
+                return io.StringIO(content)
             else:
                 return io.BytesIO(content)
         else:
             return orig_open(name, *args, **kwargs)
 
     orig_open = open
-    patch_point = 'builtins.open' if PY3 else '__builtin__.open'
-    with mock.patch(patch_point, create=True, side_effect=open_mock) as m:
+    with mock.patch("builtins.open", create=True, side_effect=open_mock) as m:
         yield m
 
 
@@ -248,12 +214,10 @@ def mock_open_exception(for_path, exc):
     def open_mock(name, *args, **kwargs):
         if name == for_path:
             raise exc
-        else:
-            return orig_open(name, *args, **kwargs)
+        return orig_open(name, *args, **kwargs)
 
     orig_open = open
-    patch_point = 'builtins.open' if PY3 else '__builtin__.open'
-    with mock.patch(patch_point, create=True, side_effect=open_mock) as m:
+    with mock.patch("builtins.open", create=True, side_effect=open_mock) as m:
         yield m
 
 
@@ -302,7 +266,7 @@ class TestSystemVirtualMemoryAgainstFree(PsutilTestCase):
         psutil_value = psutil.virtual_memory().shared
         assert (
             abs(free_value - psutil_value) < TOLERANCE_SYS_MEM
-        ), '%s %s \n%s' % (free_value, psutil_value, free.output)
+        ), f"{free_value} {psutil_value} \n{free.output}"
 
     @retry_on_failure()
     def test_available(self):
@@ -312,12 +276,9 @@ class TestSystemVirtualMemoryAgainstFree(PsutilTestCase):
         lines = out.split('\n')
         if 'available' not in lines[0]:
             raise pytest.skip("free does not support 'available' column")
-        else:
-            free_value = int(lines[1].split()[-1])
-            psutil_value = psutil.virtual_memory().available
-            assert (
-                abs(free_value - psutil_value) < TOLERANCE_SYS_MEM
-            ), '%s %s \n%s' % (free_value, psutil_value, out)
+        free_value = int(lines[1].split()[-1])
+        psutil_value = psutil.virtual_memory().available
+        assert abs(free_value - psutil_value) < TOLERANCE_SYS_MEM
 
 
 @pytest.mark.skipif(not LINUX, reason="LINUX only")
@@ -495,10 +456,7 @@ class TestSystemVirtualMemoryMocks(PsutilTestCase):
             SReclaimable:     346648 kB
             """).encode()
         with mock_open_content({"/proc/meminfo": content}):
-            with mock_open_exception(
-                "/proc/zoneinfo",
-                IOError(errno.ENOENT, 'no such file or directory'),
-            ):
+            with mock_open_exception("/proc/zoneinfo", FileNotFoundError):
                 with warnings.catch_warnings(record=True) as ws:
                     ret = psutil.virtual_memory()
                     assert ret.available == 2057400 * 1024 + 4818144 * 1024
@@ -623,9 +581,7 @@ class TestSystemSwapMemory(PsutilTestCase):
 
     def test_no_vmstat_mocked(self):
         # see https://github.com/giampaolo/psutil/issues/722
-        with mock_open_exception(
-            "/proc/vmstat", IOError(errno.ENOENT, 'no such file or directory')
-        ) as m:
+        with mock_open_exception("/proc/vmstat", FileNotFoundError) as m:
             with warnings.catch_warnings(record=True) as ws:
                 warnings.simplefilter("always")
                 ret = psutil.swap_memory()
@@ -714,14 +670,14 @@ class TestSystemCPUCountLogical(PsutilTestCase):
         assert psutil.cpu_count() == count
 
     @pytest.mark.skipif(
-        not which("nproc"), reason="nproc utility not available"
+        not shutil.which("nproc"), reason="nproc utility not available"
     )
     def test_against_nproc(self):
         num = int(sh("nproc --all"))
         assert psutil.cpu_count(logical=True) == num
 
     @pytest.mark.skipif(
-        not which("lscpu"), reason="lscpu utility not available"
+        not shutil.which("lscpu"), reason="lscpu utility not available"
     )
     def test_against_lscpu(self):
         out = sh("lscpu -p")
@@ -768,7 +724,7 @@ class TestSystemCPUCountLogical(PsutilTestCase):
 @pytest.mark.skipif(not LINUX, reason="LINUX only")
 class TestSystemCPUCountCores(PsutilTestCase):
     @pytest.mark.skipif(
-        not which("lscpu"), reason="lscpu utility not available"
+        not shutil.which("lscpu"), reason="lscpu utility not available"
     )
     def test_against_lscpu(self):
         out = sh("lscpu -p")
@@ -779,6 +735,9 @@ class TestSystemCPUCountCores(PsutilTestCase):
                 core_ids.add(fields[1])
         assert psutil.cpu_count(logical=False) == len(core_ids)
 
+    @pytest.mark.skipif(
+        platform.machine() not in {"x86_64", "i686"}, reason="x86_64/i686 only"
+    )
     def test_method_2(self):
         meth_1 = psutil._pslinux.cpu_count_cores()
         with mock.patch('glob.glob', return_value=[]) as m:
@@ -798,6 +757,9 @@ class TestSystemCPUCountCores(PsutilTestCase):
 @pytest.mark.skipif(not LINUX, reason="LINUX only")
 class TestSystemCPUFrequency(PsutilTestCase):
     @pytest.mark.skipif(not HAS_CPU_FREQ, reason="not supported")
+    @pytest.mark.skipif(
+        AARCH64, reason="aarch64 does not always expose frequency"
+    )
     def test_emulate_use_second_file(self):
         # https://github.com/giampaolo/psutil/issues/981
         def path_exists_mock(path):
@@ -861,8 +823,7 @@ class TestSystemCPUFrequency(PsutilTestCase):
                 return orig_open(name, *args, **kwargs)
 
         orig_open = open
-        patch_point = 'builtins.open' if PY3 else '__builtin__.open'
-        with mock.patch(patch_point, side_effect=open_mock):
+        with mock.patch("builtins.open", side_effect=open_mock):
             with mock.patch('os.path.exists', return_value=True):
                 freq = psutil.cpu_freq()
                 assert freq.current == 500.0
@@ -907,8 +868,7 @@ class TestSystemCPUFrequency(PsutilTestCase):
                 return orig_open(name, *args, **kwargs)
 
         orig_open = open
-        patch_point = 'builtins.open' if PY3 else '__builtin__.open'
-        with mock.patch(patch_point, side_effect=open_mock):
+        with mock.patch("builtins.open", side_effect=open_mock):
             with mock.patch('os.path.exists', return_value=True):
                 with mock.patch(
                     'psutil._pslinux.cpu_count_logical', return_value=2
@@ -930,8 +890,8 @@ class TestSystemCPUFrequency(PsutilTestCase):
         # See: https://github.com/giampaolo/psutil/issues/1071
         def open_mock(name, *args, **kwargs):
             if name.endswith('/scaling_cur_freq'):
-                raise IOError(errno.ENOENT, "")
-            elif name.endswith('/cpuinfo_cur_freq'):
+                raise FileNotFoundError
+            if name.endswith('/cpuinfo_cur_freq'):
                 return io.BytesIO(b"200000")
             elif name == '/proc/cpuinfo':
                 return io.BytesIO(b"cpu MHz     : 200")
@@ -939,8 +899,7 @@ class TestSystemCPUFrequency(PsutilTestCase):
                 return orig_open(name, *args, **kwargs)
 
         orig_open = open
-        patch_point = 'builtins.open' if PY3 else '__builtin__.open'
-        with mock.patch(patch_point, side_effect=open_mock):
+        with mock.patch("builtins.open", side_effect=open_mock):
             with mock.patch('os.path.exists', return_value=True):
                 with mock.patch(
                     'psutil._pslinux.cpu_count_logical', return_value=1
@@ -1007,7 +966,8 @@ class TestSystemNetIfAddrs(PsutilTestCase):
                     assert address in get_ipv6_addresses(name)
 
     # XXX - not reliable when having virtual NICs installed by Docker.
-    # @pytest.mark.skipif(not which('ip'), reason="'ip' utility not available")
+    # @pytest.mark.skipif(not shutil.which("ip"),
+    #                     reason="'ip' utility not available")
     # def test_net_if_names(self):
     #     out = sh("ip addr").strip()
     #     nics = [x for x in psutil.net_if_addrs().keys() if ':' not in x]
@@ -1018,20 +978,19 @@ class TestSystemNetIfAddrs(PsutilTestCase):
     #             found += 1
     #             name = line.split(':')[1].strip()
     #             self.assertIn(name, nics)
-    #     self.assertEqual(len(nics), found, msg="%s\n---\n%s" % (
+    #     self.assertEqual(len(nics), found, msg="{}\n---\n{}".format(
     #         pprint.pformat(nics), out))
 
 
 @pytest.mark.skipif(not LINUX, reason="LINUX only")
-@pytest.mark.skipif(QEMU_USER, reason="QEMU user not supported")
 class TestSystemNetIfStats(PsutilTestCase):
     @pytest.mark.skipif(
-        not which("ifconfig"), reason="ifconfig utility not available"
+        not shutil.which("ifconfig"), reason="ifconfig utility not available"
     )
     def test_against_ifconfig(self):
         for name, stats in psutil.net_if_stats().items():
             try:
-                out = sh("ifconfig %s" % name)
+                out = sh(f"ifconfig {name}")
             except RuntimeError:
                 pass
             else:
@@ -1042,11 +1001,11 @@ class TestSystemNetIfStats(PsutilTestCase):
 
     def test_mtu(self):
         for name, stats in psutil.net_if_stats().items():
-            with open("/sys/class/net/%s/mtu" % name) as f:
+            with open(f"/sys/class/net/{name}/mtu") as f:
                 assert stats.mtu == int(f.read().strip())
 
     @pytest.mark.skipif(
-        not which("ifconfig"), reason="ifconfig utility not available"
+        not shutil.which("ifconfig"), reason="ifconfig utility not available"
     )
     def test_flags(self):
         # first line looks like this:
@@ -1054,7 +1013,7 @@ class TestSystemNetIfStats(PsutilTestCase):
         matches_found = 0
         for name, stats in psutil.net_if_stats().items():
             try:
-                out = sh("ifconfig %s" % name)
+                out = sh(f"ifconfig {name}")
             except RuntimeError:
                 pass
             else:
@@ -1081,13 +1040,13 @@ class TestSystemNetIfStats(PsutilTestCase):
 @pytest.mark.skipif(not LINUX, reason="LINUX only")
 class TestSystemNetIOCounters(PsutilTestCase):
     @pytest.mark.skipif(
-        not which("ifconfig"), reason="ifconfig utility not available"
+        not shutil.which("ifconfig"), reason="ifconfig utility not available"
     )
     @retry_on_failure()
     def test_against_ifconfig(self):
         def ifconfig(nic):
             ret = {}
-            out = sh("ifconfig %s" % nic)
+            out = sh(f"ifconfig {nic}")
             ret['packets_recv'] = int(
                 re.findall(r'RX packets[: ](\d+)', out)[0]
             )
@@ -1140,7 +1099,7 @@ class TestSystemNetConnections(PsutilTestCase):
             s = socket.socket(socket.AF_INET6, socket.SOCK_STREAM)
             self.addCleanup(s.close)
             s.bind(("::1", 0))
-        except socket.error:
+        except OSError:
             pass
         psutil.net_connections(kind='inet6')
 
@@ -1171,7 +1130,7 @@ class TestSystemDiskPartitions(PsutilTestCase):
         # test psutil.disk_usage() and psutil.disk_partitions()
         # against "df -a"
         def df(path):
-            out = sh('df -P -B 1 "%s"' % path).strip()
+            out = sh(f'df -P -B 1 "{path}"').strip()
             lines = out.split('\n')
             lines.pop(0)
             line = lines.pop(0)
@@ -1198,7 +1157,7 @@ class TestSystemDiskPartitions(PsutilTestCase):
                     return
 
         # No ZFS partitions on this system. Let's fake one.
-        fake_file = io.StringIO(u"nodev\tzfs\n")
+        fake_file = io.StringIO("nodev\tzfs\n")
         with mock.patch(
             'psutil._common.open', return_value=fake_file, create=True
         ) as m1:
@@ -1375,9 +1334,7 @@ class TestRootFsDeviceFinder(PsutilTestCase):
         else:
             with pytest.raises(FileNotFoundError):
                 finder.ask_proc_partitions()
-        if os.path.exists(
-            "/sys/dev/block/%s:%s/uevent" % (self.major, self.minor)
-        ):
+        if os.path.exists(f"/sys/dev/block/{self.major}:{self.minor}/uevent"):
             finder.ask_sys_dev_block()
         else:
             with pytest.raises(FileNotFoundError):
@@ -1392,9 +1349,7 @@ class TestRootFsDeviceFinder(PsutilTestCase):
         a = b = c = None
         if os.path.exists("/proc/partitions"):
             a = finder.ask_proc_partitions()
-        if os.path.exists(
-            "/sys/dev/block/%s:%s/uevent" % (self.major, self.minor)
-        ):
+        if os.path.exists(f"/sys/dev/block/{self.major}:{self.minor}/uevent"):
             b = finder.ask_sys_class_block()
         c = finder.ask_sys_dev_block()
 
@@ -1407,7 +1362,7 @@ class TestRootFsDeviceFinder(PsutilTestCase):
             assert base == c
 
     @pytest.mark.skipif(
-        not which("findmnt"), reason="findmnt utility not available"
+        not shutil.which("findmnt"), reason="findmnt utility not available"
     )
     @pytest.mark.skipif(GITHUB_ACTIONS, reason="unsupported on GITHUB_ACTIONS")
     def test_against_findmnt(self):
@@ -1455,24 +1410,23 @@ class TestMisc(PsutilTestCase):
 
             def open_mock(name, *args, **kwargs):
                 if name.startswith('/proc'):
-                    raise IOError(errno.ENOENT, 'rejecting access for test')
+                    raise FileNotFoundError
                 return orig_open(name, *args, **kwargs)
 
-            patch_point = 'builtins.open' if PY3 else '__builtin__.open'
-            with mock.patch(patch_point, side_effect=open_mock):
+            with mock.patch("builtins.open", side_effect=open_mock):
                 reload_module(psutil)
 
-                with pytest.raises(IOError):
+                with pytest.raises(OSError):
                     psutil.cpu_times()
-                with pytest.raises(IOError):
+                with pytest.raises(OSError):
                     psutil.cpu_times(percpu=True)
-                with pytest.raises(IOError):
+                with pytest.raises(OSError):
                     psutil.cpu_percent()
-                with pytest.raises(IOError):
+                with pytest.raises(OSError):
                     psutil.cpu_percent(percpu=True)
-                with pytest.raises(IOError):
+                with pytest.raises(OSError):
                     psutil.cpu_times_percent()
-                with pytest.raises(IOError):
+                with pytest.raises(OSError):
                     psutil.cpu_times_percent(percpu=True)
 
                 psutil.PROCFS_PATH = my_procfs
@@ -1563,23 +1517,23 @@ class TestMisc(PsutilTestCase):
         os.mkdir(tdir)
         try:
             psutil.PROCFS_PATH = tdir
-            with pytest.raises(IOError):
+            with pytest.raises(OSError):
                 psutil.virtual_memory()
-            with pytest.raises(IOError):
+            with pytest.raises(OSError):
                 psutil.cpu_times()
-            with pytest.raises(IOError):
+            with pytest.raises(OSError):
                 psutil.cpu_times(percpu=True)
-            with pytest.raises(IOError):
+            with pytest.raises(OSError):
                 psutil.boot_time()
-            # self.assertRaises(IOError, psutil.pids)
-            with pytest.raises(IOError):
+            # self.assertRaises(OSError, psutil.pids)
+            with pytest.raises(OSError):
                 psutil.net_connections()
-            with pytest.raises(IOError):
+            with pytest.raises(OSError):
                 psutil.net_io_counters()
-            with pytest.raises(IOError):
+            with pytest.raises(OSError):
                 psutil.net_if_stats()
-            # self.assertRaises(IOError, psutil.disk_io_counters)
-            with pytest.raises(IOError):
+            # self.assertRaises(OSError, psutil.disk_io_counters)
+            with pytest.raises(OSError):
                 psutil.disk_partitions()
             with pytest.raises(psutil.NoSuchProcess):
                 psutil.Process()
@@ -1597,7 +1551,7 @@ class TestMisc(PsutilTestCase):
         with ThreadTask():
             p = psutil.Process()
             threads = p.threads()
-            assert len(threads) == (3 if QEMU_USER else 2)
+            assert len(threads) == 2
             tid = sorted(threads, key=lambda x: x.id)[1].id
             assert p.pid != tid
             pt = psutil.Process(tid)
@@ -1621,7 +1575,9 @@ class TestMisc(PsutilTestCase):
 @pytest.mark.skipif(not LINUX, reason="LINUX only")
 @pytest.mark.skipif(not HAS_BATTERY, reason="no battery")
 class TestSensorsBattery(PsutilTestCase):
-    @pytest.mark.skipif(not which("acpi"), reason="acpi utility not available")
+    @pytest.mark.skipif(
+        not shutil.which("acpi"), reason="acpi utility not available"
+    )
     def test_percent(self):
         out = sh("acpi -b")
         acpi_value = int(out.split(",")[1].strip().replace('%', ''))
@@ -1637,8 +1593,7 @@ class TestSensorsBattery(PsutilTestCase):
                 return orig_open(name, *args, **kwargs)
 
         orig_open = open
-        patch_point = 'builtins.open' if PY3 else '__builtin__.open'
-        with mock.patch(patch_point, side_effect=open_mock) as m:
+        with mock.patch("builtins.open", side_effect=open_mock) as m:
             assert psutil.sensors_battery().power_plugged is True
             assert (
                 psutil.sensors_battery().secsleft
@@ -1651,15 +1606,14 @@ class TestSensorsBattery(PsutilTestCase):
         # case code relies on /status file.
         def open_mock(name, *args, **kwargs):
             if name.endswith(('AC0/online', 'AC/online')):
-                raise IOError(errno.ENOENT, "")
-            elif name.endswith("/status"):
-                return io.StringIO(u"charging")
+                raise FileNotFoundError
+            if name.endswith("/status"):
+                return io.StringIO("charging")
             else:
                 return orig_open(name, *args, **kwargs)
 
         orig_open = open
-        patch_point = 'builtins.open' if PY3 else '__builtin__.open'
-        with mock.patch(patch_point, side_effect=open_mock) as m:
+        with mock.patch("builtins.open", side_effect=open_mock) as m:
             assert psutil.sensors_battery().power_plugged is True
             assert m.called
 
@@ -1672,8 +1626,7 @@ class TestSensorsBattery(PsutilTestCase):
                 return orig_open(name, *args, **kwargs)
 
         orig_open = open
-        patch_point = 'builtins.open' if PY3 else '__builtin__.open'
-        with mock.patch(patch_point, side_effect=open_mock) as m:
+        with mock.patch("builtins.open", side_effect=open_mock) as m:
             assert psutil.sensors_battery().power_plugged is False
             assert m.called
 
@@ -1682,15 +1635,14 @@ class TestSensorsBattery(PsutilTestCase):
         # case code relies on /status file.
         def open_mock(name, *args, **kwargs):
             if name.endswith(('AC0/online', 'AC/online')):
-                raise IOError(errno.ENOENT, "")
-            elif name.endswith("/status"):
-                return io.StringIO(u"discharging")
+                raise FileNotFoundError
+            if name.endswith("/status"):
+                return io.StringIO("discharging")
             else:
                 return orig_open(name, *args, **kwargs)
 
         orig_open = open
-        patch_point = 'builtins.open' if PY3 else '__builtin__.open'
-        with mock.patch(patch_point, side_effect=open_mock) as m:
+        with mock.patch("builtins.open", side_effect=open_mock) as m:
             assert psutil.sensors_battery().power_plugged is False
             assert m.called
 
@@ -1702,15 +1654,14 @@ class TestSensorsBattery(PsutilTestCase):
                 '/sys/class/power_supply/AC0/online',
                 '/sys/class/power_supply/AC/online',
             )):
-                raise IOError(errno.ENOENT, "")
-            elif name.startswith("/sys/class/power_supply/BAT0/status"):
+                raise FileNotFoundError
+            if name.startswith("/sys/class/power_supply/BAT0/status"):
                 return io.BytesIO(b"???")
             else:
                 return orig_open(name, *args, **kwargs)
 
         orig_open = open
-        patch_point = 'builtins.open' if PY3 else '__builtin__.open'
-        with mock.patch(patch_point, side_effect=open_mock) as m:
+        with mock.patch("builtins.open", side_effect=open_mock) as m:
             assert psutil.sensors_battery().power_plugged is None
             assert m.called
 
@@ -1727,11 +1678,11 @@ class TestSensorsBattery(PsutilTestCase):
         # Expected fallback on /capacity.
         with mock_open_exception(
             "/sys/class/power_supply/BAT0/energy_full",
-            IOError(errno.ENOENT, ""),
+            FileNotFoundError,
         ):
             with mock_open_exception(
                 "/sys/class/power_supply/BAT0/charge_full",
-                IOError(errno.ENOENT, ""),
+                FileNotFoundError,
             ):
                 with mock_open_content(
                     {"/sys/class/power_supply/BAT0/capacity": b"88"}
@@ -1741,14 +1692,14 @@ class TestSensorsBattery(PsutilTestCase):
     def test_emulate_no_power(self):
         # Emulate a case where /AC0/online file nor /BAT0/status exist.
         with mock_open_exception(
-            "/sys/class/power_supply/AC/online", IOError(errno.ENOENT, "")
+            "/sys/class/power_supply/AC/online", FileNotFoundError
         ):
             with mock_open_exception(
-                "/sys/class/power_supply/AC0/online", IOError(errno.ENOENT, "")
+                "/sys/class/power_supply/AC0/online", FileNotFoundError
             ):
                 with mock_open_exception(
                     "/sys/class/power_supply/BAT0/status",
-                    IOError(errno.ENOENT, ""),
+                    FileNotFoundError,
                 ):
                     assert psutil.sensors_battery().power_plugged is None
 
@@ -1758,18 +1709,17 @@ class TestSensorsBatteryEmulated(PsutilTestCase):
     def test_it(self):
         def open_mock(name, *args, **kwargs):
             if name.endswith("/energy_now"):
-                return io.StringIO(u"60000000")
+                return io.StringIO("60000000")
             elif name.endswith("/power_now"):
-                return io.StringIO(u"0")
+                return io.StringIO("0")
             elif name.endswith("/energy_full"):
-                return io.StringIO(u"60000001")
+                return io.StringIO("60000001")
             else:
                 return orig_open(name, *args, **kwargs)
 
         orig_open = open
-        patch_point = 'builtins.open' if PY3 else '__builtin__.open'
         with mock.patch('os.listdir', return_value=["BAT0"]) as mlistdir:
-            with mock.patch(patch_point, side_effect=open_mock) as mopen:
+            with mock.patch("builtins.open", side_effect=open_mock) as mopen:
                 assert psutil.sensors_battery() is not None
         assert mlistdir.called
         assert mopen.called
@@ -1780,9 +1730,9 @@ class TestSensorsTemperatures(PsutilTestCase):
     def test_emulate_class_hwmon(self):
         def open_mock(name, *args, **kwargs):
             if name.endswith('/name'):
-                return io.StringIO(u"name")
+                return io.StringIO("name")
             elif name.endswith('/temp1_label'):
-                return io.StringIO(u"label")
+                return io.StringIO("label")
             elif name.endswith('/temp1_input'):
                 return io.BytesIO(b"30000")
             elif name.endswith('/temp1_max'):
@@ -1793,8 +1743,7 @@ class TestSensorsTemperatures(PsutilTestCase):
                 return orig_open(name, *args, **kwargs)
 
         orig_open = open
-        patch_point = 'builtins.open' if PY3 else '__builtin__.open'
-        with mock.patch(patch_point, side_effect=open_mock):
+        with mock.patch("builtins.open", side_effect=open_mock):
             # Test case with /sys/class/hwmon
             with mock.patch(
                 'glob.glob', return_value=['/sys/class/hwmon/hwmon0/temp1']
@@ -1812,16 +1761,17 @@ class TestSensorsTemperatures(PsutilTestCase):
             elif name.endswith('temp'):
                 return io.BytesIO(b"30000")
             elif name.endswith('0_type'):
-                return io.StringIO(u"critical")
+                return io.StringIO("critical")
             elif name.endswith('type'):
-                return io.StringIO(u"name")
+                return io.StringIO("name")
             else:
                 return orig_open(name, *args, **kwargs)
 
         def glob_mock(path):
-            if path == '/sys/class/hwmon/hwmon*/temp*_*':  # noqa
-                return []
-            elif path == '/sys/class/hwmon/hwmon*/device/temp*_*':
+            if path in {
+                '/sys/class/hwmon/hwmon*/temp*_*',
+                '/sys/class/hwmon/hwmon*/device/temp*_*',
+            }:
                 return []
             elif path == '/sys/class/thermal/thermal_zone*':
                 return ['/sys/class/thermal/thermal_zone0']
@@ -1833,11 +1783,10 @@ class TestSensorsTemperatures(PsutilTestCase):
             return []
 
         orig_open = open
-        patch_point = 'builtins.open' if PY3 else '__builtin__.open'
-        with mock.patch(patch_point, side_effect=open_mock):
+        with mock.patch("builtins.open", side_effect=open_mock):
             with mock.patch('glob.glob', create=True, side_effect=glob_mock):
                 temp = psutil.sensors_temperatures()['name'][0]
-                assert temp.label == ''  # noqa
+                assert temp.label == ''
                 assert temp.current == 30.0
                 assert temp.high == 50.0
                 assert temp.critical == 50.0
@@ -1848,17 +1797,16 @@ class TestSensorsFans(PsutilTestCase):
     def test_emulate_data(self):
         def open_mock(name, *args, **kwargs):
             if name.endswith('/name'):
-                return io.StringIO(u"name")
+                return io.StringIO("name")
             elif name.endswith('/fan1_label'):
-                return io.StringIO(u"label")
+                return io.StringIO("label")
             elif name.endswith('/fan1_input'):
-                return io.StringIO(u"2000")
+                return io.StringIO("2000")
             else:
                 return orig_open(name, *args, **kwargs)
 
         orig_open = open
-        patch_point = 'builtins.open' if PY3 else '__builtin__.open'
-        with mock.patch(patch_point, side_effect=open_mock):
+        with mock.patch("builtins.open", side_effect=open_mock):
             with mock.patch(
                 'glob.glob', return_value=['/sys/class/hwmon/hwmon2/fan1']
             ):
@@ -1880,11 +1828,11 @@ class TestProcess(PsutilTestCase):
         uss, pss, swap = psutil._pslinux.Process(sproc.pid)._parse_smaps()
         maps = psutil.Process(sproc.pid).memory_maps(grouped=False)
         assert (
-            abs(uss - sum([x.private_dirty + x.private_clean for x in maps]))
+            abs(uss - sum(x.private_dirty + x.private_clean for x in maps))
             < 4096
         )
-        assert abs(pss - sum([x.pss for x in maps])) < 4096
-        assert abs(swap - sum([x.swap for x in maps])) < 4096
+        assert abs(pss - sum(x.pss for x in maps)) < 4096
+        assert abs(swap - sum(x.swap for x in maps)) < 4096
 
     def test_parse_smaps_mocked(self):
         # See: https://github.com/giampaolo/psutil/issues/1222
@@ -1911,7 +1859,7 @@ class TestProcess(PsutilTestCase):
             Locked:                19 kB
             VmFlags: rd ex
             """).encode()
-        with mock_open_content({"/proc/%s/smaps" % os.getpid(): content}) as m:
+        with mock_open_content({f"/proc/{os.getpid()}/smaps": content}) as m:
             p = psutil._pslinux.Process(os.getpid())
             uss, pss, swap = p._parse_smaps()
             assert m.called
@@ -1946,14 +1894,13 @@ class TestProcess(PsutilTestCase):
             assert get_test_file(testfn).mode == "r+"
         with open(testfn, "a+"):
             assert get_test_file(testfn).mode == "a+"
-        # note: "x" bit is not supported
-        if PY3:
-            safe_rmpath(testfn)
-            with open(testfn, "x"):
-                assert get_test_file(testfn).mode == "w"
-            safe_rmpath(testfn)
-            with open(testfn, "x+"):
-                assert get_test_file(testfn).mode == "r+"
+
+        safe_rmpath(testfn)
+        with open(testfn, "x"):
+            assert get_test_file(testfn).mode == "w"
+        safe_rmpath(testfn)
+        with open(testfn, "x+"):
+            assert get_test_file(testfn).mode == "r+"
 
     def test_open_files_file_gone(self):
         # simulates a file which gets deleted during open_files()
@@ -1965,7 +1912,7 @@ class TestProcess(PsutilTestCase):
             call_until(lambda: len(p.open_files()) != len(files))
             with mock.patch(
                 'psutil._pslinux.os.readlink',
-                side_effect=OSError(errno.ENOENT, ""),
+                side_effect=FileNotFoundError,
             ) as m:
                 assert p.open_files() == []
                 assert m.called
@@ -1987,9 +1934,8 @@ class TestProcess(PsutilTestCase):
         with open(self.get_testfn(), 'w'):
             # give the kernel some time to see the new file
             call_until(lambda: len(p.open_files()) != len(files))
-            patch_point = 'builtins.open' if PY3 else '__builtin__.open'
             with mock.patch(
-                patch_point, side_effect=IOError(errno.ENOENT, "")
+                "builtins.open", side_effect=FileNotFoundError
             ) as m:
                 assert p.open_files() == []
                 assert m.called
@@ -2031,13 +1977,13 @@ class TestProcess(PsutilTestCase):
     def test_cmdline_mocked(self):
         # see: https://github.com/giampaolo/psutil/issues/639
         p = psutil.Process()
-        fake_file = io.StringIO(u'foo\x00bar\x00')
+        fake_file = io.StringIO('foo\x00bar\x00')
         with mock.patch(
             'psutil._common.open', return_value=fake_file, create=True
         ) as m:
             assert p.cmdline() == ['foo', 'bar']
             assert m.called
-        fake_file = io.StringIO(u'foo\x00bar\x00\x00')
+        fake_file = io.StringIO('foo\x00bar\x00\x00')
         with mock.patch(
             'psutil._common.open', return_value=fake_file, create=True
         ) as m:
@@ -2047,13 +1993,13 @@ class TestProcess(PsutilTestCase):
     def test_cmdline_spaces_mocked(self):
         # see: https://github.com/giampaolo/psutil/issues/1179
         p = psutil.Process()
-        fake_file = io.StringIO(u'foo bar ')
+        fake_file = io.StringIO('foo bar ')
         with mock.patch(
             'psutil._common.open', return_value=fake_file, create=True
         ) as m:
             assert p.cmdline() == ['foo', 'bar']
             assert m.called
-        fake_file = io.StringIO(u'foo bar  ')
+        fake_file = io.StringIO('foo bar  ')
         with mock.patch(
             'psutil._common.open', return_value=fake_file, create=True
         ) as m:
@@ -2064,7 +2010,7 @@ class TestProcess(PsutilTestCase):
         # https://github.com/giampaolo/psutil/issues/
         #    1179#issuecomment-552984549
         p = psutil.Process()
-        fake_file = io.StringIO(u'foo\x20bar\x00')
+        fake_file = io.StringIO('foo\x20bar\x00')
         with mock.patch(
             'psutil._common.open', return_value=fake_file, create=True
         ) as m:
@@ -2084,14 +2030,12 @@ class TestProcess(PsutilTestCase):
         # condition). threads() is supposed to ignore that instead
         # of raising NSP.
         def open_mock_1(name, *args, **kwargs):
-            if name.startswith('/proc/%s/task' % os.getpid()):
-                raise IOError(errno.ENOENT, "")
-            else:
-                return orig_open(name, *args, **kwargs)
+            if name.startswith(f"/proc/{os.getpid()}/task"):
+                raise FileNotFoundError
+            return orig_open(name, *args, **kwargs)
 
         orig_open = open
-        patch_point = 'builtins.open' if PY3 else '__builtin__.open'
-        with mock.patch(patch_point, side_effect=open_mock_1) as m:
+        with mock.patch("builtins.open", side_effect=open_mock_1) as m:
             ret = psutil.Process().threads()
             assert m.called
             assert ret == []
@@ -2099,18 +2043,17 @@ class TestProcess(PsutilTestCase):
         # ...but if it bumps into something != ENOENT we want an
         # exception.
         def open_mock_2(name, *args, **kwargs):
-            if name.startswith('/proc/%s/task' % os.getpid()):
-                raise IOError(errno.EPERM, "")
-            else:
-                return orig_open(name, *args, **kwargs)
+            if name.startswith(f"/proc/{os.getpid()}/task"):
+                raise PermissionError
+            return orig_open(name, *args, **kwargs)
 
-        with mock.patch(patch_point, side_effect=open_mock_2):
+        with mock.patch("builtins.open", side_effect=open_mock_2):
             with pytest.raises(psutil.AccessDenied):
                 psutil.Process().threads()
 
     def test_exe_mocked(self):
         with mock.patch(
-            'psutil._pslinux.readlink', side_effect=OSError(errno.ENOENT, "")
+            'psutil._pslinux.readlink', side_effect=FileNotFoundError
         ) as m:
             # de-activate guessing from cmdline()
             with mock.patch(
@@ -2118,13 +2061,13 @@ class TestProcess(PsutilTestCase):
             ):
                 ret = psutil.Process().exe()
                 assert m.called
-                assert ret == ""  # noqa
+                assert ret == ""
 
     def test_issue_1014(self):
         # Emulates a case where smaps file does not exist. In this case
         # wrap_exception decorator should not raise NoSuchProcess.
         with mock_open_exception(
-            '/proc/%s/smaps' % os.getpid(), IOError(errno.ENOENT, "")
+            f"/proc/{os.getpid()}/smaps", FileNotFoundError
         ) as m:
             p = psutil.Process()
             with pytest.raises(FileNotFoundError):
@@ -2134,7 +2077,7 @@ class TestProcess(PsutilTestCase):
     def test_issue_2418(self):
         p = psutil.Process()
         with mock_open_exception(
-            '/proc/%s/statm' % os.getpid(), FileNotFoundError
+            f"/proc/{os.getpid()}/statm", FileNotFoundError
         ):
             with mock.patch("os.path.exists", return_value=False):
                 with pytest.raises(psutil.NoSuchProcess):
@@ -2146,7 +2089,7 @@ class TestProcess(PsutilTestCase):
         # happen in case of zombie process:
         # https://travis-ci.org/giampaolo/psutil/jobs/51368273
         with mock.patch(
-            "psutil._pslinux.prlimit", side_effect=OSError(errno.ENOSYS, "")
+            "resource.prlimit", side_effect=OSError(errno.ENOSYS, "")
         ) as m1:
             with mock.patch(
                 "psutil._pslinux.Process._is_zombie", return_value=True
@@ -2206,7 +2149,7 @@ class TestProcess(PsutilTestCase):
             "7",  # delayacct_blkio_ticks
         ]
         content = " ".join(args).encode()
-        with mock_open_content({"/proc/%s/stat" % os.getpid(): content}):
+        with mock_open_content({f"/proc/{os.getpid()}/stat": content}):
             p = psutil.Process()
             assert p.name() == 'cat'
             assert p.status() == psutil.STATUS_ZOMBIE
@@ -2229,7 +2172,7 @@ class TestProcess(PsutilTestCase):
             Cpus_allowed_list:\t0-7
             voluntary_ctxt_switches:\t12
             nonvoluntary_ctxt_switches:\t13""").encode()
-        with mock_open_content({"/proc/%s/status" % os.getpid(): content}):
+        with mock_open_content({f"/proc/{os.getpid()}/status": content}):
             p = psutil.Process()
             assert p.num_ctx_switches().voluntary == 12
             assert p.num_ctx_switches().involuntary == 13
@@ -2273,7 +2216,7 @@ class TestProcessAgainstStatus(PsutilTestCase):
 
     def read_status_file(self, linestart):
         with psutil._psplatform.open_text(
-            '/proc/%s/status' % self.proc.pid
+            f"/proc/{self.proc.pid}/status"
         ) as f:
             for line in f:
                 line = line.strip()
@@ -2283,13 +2226,12 @@ class TestProcessAgainstStatus(PsutilTestCase):
                         return int(value)
                     except ValueError:
                         return value
-            raise ValueError("can't find %r" % linestart)
+            raise ValueError(f"can't find {linestart!r}")
 
     def test_name(self):
         value = self.read_status_file("Name:")
         assert self.proc.name() == value
 
-    @pytest.mark.skipif(QEMU_USER, reason="QEMU user not supported")
     def test_status(self):
         value = self.read_status_file("State:")
         value = value[value.find('(') + 1 : value.rfind(')')]