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

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

@@ -6,8 +6,8 @@
 
 """Tests for system APIS."""
 
-import contextlib
 import datetime
+import enum
 import errno
 import os
 import platform
@@ -17,6 +17,7 @@ import signal
 import socket
 import sys
 import time
+from unittest import mock
 
 import psutil
 from psutil import AIX
@@ -29,12 +30,10 @@ from psutil import OPENBSD
 from psutil import POSIX
 from psutil import SUNOS
 from psutil import WINDOWS
-from psutil._compat import PY3
-from psutil._compat import FileNotFoundError
-from psutil._compat import long
+from psutil._common import broadcast_addr
+from psutil.tests import AARCH64
 from psutil.tests import ASCII_FS
 from psutil.tests import CI_TESTING
-from psutil.tests import DEVNULL
 from psutil.tests import GITHUB_ACTIONS
 from psutil.tests import GLOBAL_TIMEOUT
 from psutil.tests import HAS_BATTERY
@@ -47,12 +46,9 @@ from psutil.tests import HAS_SENSORS_TEMPERATURES
 from psutil.tests import IS_64BIT
 from psutil.tests import MACOS_12PLUS
 from psutil.tests import PYPY
-from psutil.tests import QEMU_USER
 from psutil.tests import UNICODE_SUFFIX
 from psutil.tests import PsutilTestCase
 from psutil.tests import check_net_address
-from psutil.tests import enum
-from psutil.tests import mock
 from psutil.tests import pytest
 from psutil.tests import retry_on_failure
 
@@ -73,7 +69,7 @@ class TestProcessIter(PsutilTestCase):
         assert sproc.pid not in [x.pid for x in psutil.process_iter()]
 
     def test_no_duplicates(self):
-        ls = [x for x in psutil.process_iter()]
+        ls = list(psutil.process_iter())
         assert sorted(ls, key=lambda x: x.pid) == sorted(
             set(ls), key=lambda x: x.pid
         )
@@ -85,7 +81,7 @@ class TestProcessIter(PsutilTestCase):
                 'psutil.Process.as_dict',
                 side_effect=psutil.NoSuchProcess(os.getpid()),
             ):
-                assert list(psutil.process_iter(attrs=["cpu_times"])) == []
+                assert not list(psutil.process_iter(attrs=["cpu_times"]))
             psutil.process_iter.cache_clear()  # repeat test without cache
 
     def test_emulate_access_denied(self):
@@ -156,9 +152,9 @@ class TestProcessAPIs(PsutilTestCase):
         gone, alive = psutil.wait_procs(procs, timeout=0.01, callback=callback)
 
         assert time.time() - t < 0.5
-        assert gone == []
+        assert not gone
         assert len(alive) == 3
-        assert pids == []
+        assert not pids
         for p in alive:
             assert not hasattr(p, 'returncode')
 
@@ -194,7 +190,7 @@ class TestProcessAPIs(PsutilTestCase):
         sproc1.terminate()
         sproc2.terminate()
         gone, alive = test_2(procs, callback)
-        assert set(pids) == set([sproc1.pid, sproc2.pid, sproc3.pid])
+        assert set(pids) == {sproc1.pid, sproc2.pid, sproc3.pid}
         for p in gone:
             assert hasattr(p, 'returncode')
 
@@ -248,7 +244,7 @@ class TestMiscAPIs(PsutilTestCase):
     )
     def test_users(self):
         users = psutil.users()
-        assert users != []
+        assert users
         for user in users:
             with self.subTest(user=user):
                 assert user.name
@@ -256,8 +252,8 @@ class TestMiscAPIs(PsutilTestCase):
                 assert isinstance(user.terminal, (str, type(None)))
                 if user.host is not None:
                     assert isinstance(user.host, (str, type(None)))
-                user.terminal  # noqa
-                user.host  # noqa
+                user.terminal  # noqa: B018
+                user.host  # noqa: B018
                 assert user.started > 0.0
                 datetime.datetime.fromtimestamp(user.started)
                 if WINDOWS or OPENBSD:
@@ -265,15 +261,6 @@ class TestMiscAPIs(PsutilTestCase):
                 else:
                     psutil.Process(user.pid)
 
-    def test_test(self):
-        # test for psutil.test() function
-        stdout = sys.stdout
-        sys.stdout = DEVNULL
-        try:
-            psutil.test()
-        finally:
-            sys.stdout = stdout
-
     def test_os_constants(self):
         names = [
             "POSIX",
@@ -335,14 +322,13 @@ class TestMemoryAPIs(PsutilTestCase):
         for name in mem._fields:
             value = getattr(mem, name)
             if name != 'percent':
-                assert isinstance(value, (int, long))
+                assert isinstance(value, int)
             if name != 'total':
                 if not value >= 0:
-                    raise self.fail("%r < 0 (%s)" % (name, value))
+                    raise self.fail(f"{name!r} < 0 ({value})")
                 if value > mem.total:
                     raise self.fail(
-                        "%r > total (total=%s, %s=%s)"
-                        % (name, mem.total, name, value)
+                        f"{name!r} > total (total={mem.total}, {name}={value})"
                     )
 
     def test_swap_memory(self):
@@ -431,8 +417,9 @@ class TestCpuAPIs(PsutilTestCase):
         #         for field in new._fields:
         #             new_t = getattr(new, field)
         #             last_t = getattr(last, field)
-        #             self.assertGreaterEqual(new_t, last_t,
-        #                                     msg="%s %s" % (new_t, last_t))
+        #             self.assertGreaterEqual(
+        #                 new_t, last_t,
+        #                 msg="{} {}".format(new_t, last_t))
         #         last = new
 
     def test_cpu_times_time_increases(self):
@@ -476,7 +463,7 @@ class TestCpuAPIs(PsutilTestCase):
         #             new_t = getattr(newcpu, field)
         #             last_t = getattr(lastcpu, field)
         #             self.assertGreaterEqual(
-        #                 new_t, last_t, msg="%s %s" % (lastcpu, newcpu))
+        #                 new_t, last_t, msg="{} {}".format(lastcpu, newcpu))
         #     last = new
 
     def test_per_cpu_times_2(self):
@@ -492,11 +479,12 @@ class TestCpuAPIs(PsutilTestCase):
                 t1, t2 = psutil._cpu_busy_time(t1), psutil._cpu_busy_time(t2)
                 difference = t2 - t1
                 if difference >= 0.05:
-                    return
+                    return None
 
     @pytest.mark.skipif(
         CI_TESTING and OPENBSD, reason="unreliable on OPENBSD + CI"
     )
+    @retry_on_failure(30)
     def test_cpu_times_comparison(self):
         # Make sure the sum of all per cpu times is almost equal to
         # base "one cpu" times. On OpenBSD the sum of per-CPUs is
@@ -508,7 +496,7 @@ class TestCpuAPIs(PsutilTestCase):
             with self.subTest(field=field, base=base, per_cpu=per_cpu):
                 assert (
                     abs(getattr(base, field) - getattr(summed_values, field))
-                    < 1
+                    < 2
                 )
 
     def _test_cpu_percent(self, percent, last_ret, new_ret):
@@ -518,8 +506,9 @@ class TestCpuAPIs(PsutilTestCase):
             assert percent <= 100.0 * psutil.cpu_count()
         except AssertionError as err:
             raise AssertionError(
-                "\n%s\nlast=%s\nnew=%s"
-                % (err, pprint.pformat(last_ret), pprint.pformat(new_ret))
+                "\n{}\nlast={}\nnew={}".format(
+                    err, pprint.pformat(last_ret), pprint.pformat(new_ret)
+                )
             )
 
     def test_cpu_percent(self):
@@ -605,12 +594,14 @@ class TestCpuAPIs(PsutilTestCase):
                     assert nt.current <= nt.max
                 for name in nt._fields:
                     value = getattr(nt, name)
-                    assert isinstance(value, (int, long, float))
+                    assert isinstance(value, (int, float))
                     assert value >= 0
 
         ls = psutil.cpu_freq(percpu=True)
-        if FREEBSD and not ls:
-            raise pytest.skip("returns empty list on FreeBSD")
+        if (FREEBSD or AARCH64) and not ls:
+            raise pytest.skip(
+                "returns empty list on FreeBSD and Linux aarch64"
+            )
 
         assert ls, ls
         check_ls([psutil.cpu_freq(percpu=False)])
@@ -685,7 +676,7 @@ class TestDiskAPIs(PsutilTestCase):
             else:
                 # we cannot make any assumption about this, see:
                 # http://goo.gl/p9c43
-                disk.device  # noqa
+                disk.device  # noqa: B018
             # on modern systems mount points can also be files
             assert os.path.exists(disk.mountpoint), disk
             assert disk.fstype, disk
@@ -811,7 +802,6 @@ class TestNetAPIs(PsutilTestCase):
             assert psutil.net_io_counters(pernic=True) == {}
             assert m.called
 
-    @pytest.mark.skipif(QEMU_USER, reason="QEMU user not supported")
     def test_net_if_addrs(self):
         nics = psutil.net_if_addrs()
         assert nics, nics
@@ -823,7 +813,7 @@ class TestNetAPIs(PsutilTestCase):
         # self.assertEqual(sorted(nics.keys()),
         #                  sorted(psutil.net_io_counters(pernic=True).keys()))
 
-        families = set([socket.AF_INET, socket.AF_INET6, psutil.AF_LINK])
+        families = {socket.AF_INET, socket.AF_INET6, psutil.AF_LINK}
         for nic, addrs in nics.items():
             assert isinstance(nic, str)
             assert len(set(addrs)) == len(addrs)
@@ -833,14 +823,12 @@ class TestNetAPIs(PsutilTestCase):
                 assert isinstance(addr.netmask, (str, type(None)))
                 assert isinstance(addr.broadcast, (str, type(None)))
                 assert addr.family in families
-                if PY3 and not PYPY:
-                    assert isinstance(addr.family, enum.IntEnum)
+                assert isinstance(addr.family, enum.IntEnum)
                 if nic_stats[nic].isup:
                     # Do not test binding to addresses of interfaces
                     # that are down
                     if addr.family == socket.AF_INET:
-                        s = socket.socket(addr.family)
-                        with contextlib.closing(s):
+                        with socket.socket(addr.family) as s:
                             s.bind((addr.address, 0))
                     elif addr.family == socket.AF_INET6:
                         info = socket.getaddrinfo(
@@ -852,8 +840,7 @@ class TestNetAPIs(PsutilTestCase):
                             socket.AI_PASSIVE,
                         )[0]
                         af, socktype, proto, _canonname, sa = info
-                        s = socket.socket(af, socktype, proto)
-                        with contextlib.closing(s):
+                        with socket.socket(af, socktype, proto) as s:
                             s.bind(sa)
                 for ip in (
                     addr.address,
@@ -873,6 +860,14 @@ class TestNetAPIs(PsutilTestCase):
                 elif addr.ptp:
                     assert addr.broadcast is None
 
+                # check broadcast address
+                if (
+                    addr.broadcast
+                    and addr.netmask
+                    and addr.family in {socket.AF_INET, socket.AF_INET6}
+                ):
+                    assert addr.broadcast == broadcast_addr(addr)
+
         if BSD or MACOS or SUNOS:
             if hasattr(socket, "AF_LINK"):
                 assert psutil.AF_LINK == socket.AF_LINK
@@ -899,7 +894,6 @@ class TestNetAPIs(PsutilTestCase):
             else:
                 assert addr.address == '06-3d-29-00-00-00'
 
-    @pytest.mark.skipif(QEMU_USER, reason="QEMU user not supported")
     def test_net_if_stats(self):
         nics = psutil.net_if_stats()
         assert nics, nics
@@ -981,5 +975,5 @@ class TestSensorsAPIs(PsutilTestCase):
             assert isinstance(name, str)
             for entry in entries:
                 assert isinstance(entry.label, str)
-                assert isinstance(entry.current, (int, long))
+                assert isinstance(entry.current, int)
                 assert entry.current >= 0

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

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 
 # Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
@@ -8,7 +7,6 @@
 """Tests for testing utils (psutil.tests namespace)."""
 
 import collections
-import contextlib
 import errno
 import os
 import socket
@@ -17,6 +15,7 @@ import subprocess
 import textwrap
 import unittest
 import warnings
+from unittest import mock
 
 import psutil
 import psutil.tests
@@ -26,7 +25,6 @@ from psutil import POSIX
 from psutil._common import open_binary
 from psutil._common import open_text
 from psutil._common import supports_ipv6
-from psutil._compat import PY3
 from psutil.tests import CI_TESTING
 from psutil.tests import COVERAGE
 from psutil.tests import HAS_NET_CONNECTIONS_UNIX
@@ -44,7 +42,6 @@ from psutil.tests import fake_pytest
 from psutil.tests import filter_proc_net_connections
 from psutil.tests import get_free_port
 from psutil.tests import is_namedtuple
-from psutil.tests import mock
 from psutil.tests import process_namespace
 from psutil.tests import pytest
 from psutil.tests import reap_children
@@ -74,7 +71,7 @@ class TestRetryDecorator(PsutilTestCase):
         def foo():
             while queue:
                 queue.pop()
-                1 / 0  # noqa
+                1 / 0  # noqa: B018
             return 1
 
         queue = list(range(3))
@@ -88,7 +85,7 @@ class TestRetryDecorator(PsutilTestCase):
         def foo():
             while queue:
                 queue.pop()
-                1 / 0  # noqa
+                1 / 0  # noqa: B018
             return 1
 
         queue = list(range(6))
@@ -112,7 +109,7 @@ class TestRetryDecorator(PsutilTestCase):
 
         @retry(retries=5, interval=None, logfun=None)
         def foo():
-            1 / 0  # noqa
+            1 / 0  # noqa: B018
 
         with pytest.raises(ZeroDivisionError):
             foo()
@@ -122,7 +119,7 @@ class TestRetryDecorator(PsutilTestCase):
     def test_retries_arg(self, sleep):
         @retry(retries=5, interval=1, logfun=None)
         def foo():
-            1 / 0  # noqa
+            1 / 0  # noqa: B018
 
         with pytest.raises(ZeroDivisionError):
             foo()
@@ -159,7 +156,7 @@ class TestSyncTestUtils(PsutilTestCase):
     def test_wait_for_file_no_file(self):
         testfn = self.get_testfn()
         with mock.patch('psutil.tests.retry.__iter__', return_value=iter([0])):
-            with pytest.raises(IOError):
+            with pytest.raises(OSError):
                 wait_for_file(testfn)
 
     def test_wait_for_file_no_delete(self):
@@ -298,14 +295,13 @@ class TestProcessUtils(PsutilTestCase):
 class TestNetUtils(PsutilTestCase):
     def bind_socket(self):
         port = get_free_port()
-        with contextlib.closing(bind_socket(addr=('', port))) as s:
+        with bind_socket(addr=('', port)) as s:
             assert s.getsockname()[1] == port
 
     @pytest.mark.skipif(not POSIX, reason="POSIX only")
     def test_bind_unix_socket(self):
         name = self.get_testfn()
-        sock = bind_unix_socket(name)
-        with contextlib.closing(sock):
+        with bind_unix_socket(name) as sock:
             assert sock.family == socket.AF_UNIX
             assert sock.type == socket.SOCK_STREAM
             assert sock.getsockname() == name
@@ -313,20 +309,17 @@ class TestNetUtils(PsutilTestCase):
             assert stat.S_ISSOCK(os.stat(name).st_mode)
         # UDP
         name = self.get_testfn()
-        sock = bind_unix_socket(name, type=socket.SOCK_DGRAM)
-        with contextlib.closing(sock):
+        with bind_unix_socket(name, type=socket.SOCK_DGRAM) as sock:
             assert sock.type == socket.SOCK_DGRAM
 
     def test_tcp_socketpair(self):
         addr = ("127.0.0.1", get_free_port())
         server, client = tcp_socketpair(socket.AF_INET, addr=addr)
-        with contextlib.closing(server):
-            with contextlib.closing(client):
-                # Ensure they are connected and the positions are
-                # correct.
-                assert server.getsockname() == addr
-                assert client.getpeername() == addr
-                assert client.getsockname() != addr
+        with server, client:
+            # Ensure they are connected and the positions are correct.
+            assert server.getsockname() == addr
+            assert client.getpeername() == addr
+            assert client.getsockname() != addr
 
     @pytest.mark.skipif(not POSIX, reason="POSIX only")
     @pytest.mark.skipif(
@@ -335,9 +328,7 @@ class TestNetUtils(PsutilTestCase):
     def test_unix_socketpair(self):
         p = psutil.Process()
         num_fds = p.num_fds()
-        assert (
-            filter_proc_net_connections(p.net_connections(kind='unix')) == []
-        )
+        assert not filter_proc_net_connections(p.net_connections(kind='unix'))
         name = self.get_testfn()
         server, client = unix_socketpair(name)
         try:
@@ -414,7 +405,7 @@ class TestMemLeakClass(TestMemoryLeak):
 
     def test_unclosed_files(self):
         def fun():
-            f = open(__file__)
+            f = open(__file__)  # noqa: SIM115
             self.addCleanup(f.close)
             box.append(f)
 
@@ -436,7 +427,7 @@ class TestMemLeakClass(TestMemoryLeak):
 
     def test_execute_w_exc(self):
         def fun_1():
-            1 / 0  # noqa
+            1 / 0  # noqa: B018
 
         self.execute_w_exc(ZeroDivisionError, fun_1)
         with pytest.raises(ZeroDivisionError):
@@ -459,7 +450,7 @@ class TestFakePytest(PsutilTestCase):
 
     def test_raises(self):
         with fake_pytest.raises(ZeroDivisionError) as cm:
-            1 / 0  # noqa
+            1 / 0  # noqa: B018
         assert isinstance(cm.value, ZeroDivisionError)
 
         with fake_pytest.raises(ValueError, match="foo") as cm:
@@ -491,7 +482,7 @@ class TestFakePytest(PsutilTestCase):
         class TestCase(unittest.TestCase):
             @fake_pytest.mark.skipif(True, reason="reason")
             def foo(self):
-                assert 1 == 1  # noqa
+                assert 1 == 1  # noqa: PLR0133
 
         result = self.run_test_class(TestCase("foo"))
         assert result.wasSuccessful()
@@ -501,18 +492,17 @@ class TestFakePytest(PsutilTestCase):
         class TestCase(unittest.TestCase):
             @fake_pytest.mark.skipif(False, reason="reason")
             def foo(self):
-                assert 1 == 1  # noqa
+                assert 1 == 1  # noqa: PLR0133
 
         result = self.run_test_class(TestCase("foo"))
         assert result.wasSuccessful()
         assert len(result.skipped) == 0
 
-    @pytest.mark.skipif(not PY3, reason="not PY3")
     def test_skip(self):
         class TestCase(unittest.TestCase):
             def foo(self):
                 fake_pytest.skip("reason")
-                assert 1 == 0  # noqa
+                assert 1 == 0  # noqa: PLR0133
 
         result = self.run_test_class(TestCase("foo"))
         assert result.wasSuccessful()
@@ -572,12 +562,12 @@ class TestTestingUtils(PsutilTestCase):
         p = psutil.Process()
         ns = process_namespace(p)
         ns.test()
-        fun = [x for x in ns.iter(ns.getters) if x[1] == 'ppid'][0][0]
+        fun = next(x for x in ns.iter(ns.getters) if x[1] == 'ppid')[0]
         assert fun() == p.ppid()
 
     def test_system_namespace(self):
         ns = system_namespace()
-        fun = [x for x in ns.iter(ns.getters) if x[1] == 'net_if_addrs'][0][0]
+        fun = next(x for x in ns.iter(ns.getters) if x[1] == 'net_if_addrs')[0]
         assert fun() == psutil.net_if_addrs()
 
 

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

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 
 # Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
@@ -20,13 +19,8 @@ process exe(), cwd() or username():
 * instead, in case of badly encoded data returned by the OS, the
   following error handlers are used to replace the corrupted characters in
   the string:
-    * Python 3: sys.getfilesystemencodeerrors() (PY 3.6+) or
-      "surrogatescape" on POSIX and "replace" on Windows
-    * Python 2: "replace"
-* on Python 2 all APIs return bytes (str type), never unicode
-* on Python 2, you can go back to unicode by doing:
-
-    >>> unicode(p.exe(), sys.getdefaultencoding(), errors="replace")
+    * sys.getfilesystemencodeerrors() or "surrogatescape" on POSIX and
+      "replace" on Windows.
 
 For a detailed explanation of how psutil handles unicode see #1040.
 
@@ -74,18 +68,13 @@ etc.) and make sure that:
 
 import os
 import shutil
-import traceback
 import warnings
 from contextlib import closing
 
 import psutil
 from psutil import BSD
-from psutil import MACOS
 from psutil import POSIX
 from psutil import WINDOWS
-from psutil._compat import PY3
-from psutil._compat import super
-from psutil.tests import APPVEYOR
 from psutil.tests import ASCII_FS
 from psutil.tests import CI_TESTING
 from psutil.tests import HAS_ENVIRON
@@ -109,27 +98,6 @@ from psutil.tests import spawn_testproc
 from psutil.tests import terminate
 
 
-if APPVEYOR:
-
-    def safe_rmpath(path):  # NOQA
-        # TODO - this is quite random and I'm not sure why it happens,
-        # nor I can reproduce it locally:
-        # https://ci.appveyor.com/project/giampaolo/psutil/build/job/
-        #     jiq2cgd6stsbtn60
-        # safe_rmpath() happens after reap_children() so this is weird
-        # Perhaps wait_procs() on Windows is broken? Maybe because
-        # of STILL_ACTIVE?
-        # https://github.com/giampaolo/psutil/blob/
-        #     68c7a70728a31d8b8b58f4be6c4c0baa2f449eda/psutil/arch/
-        #     windows/process_info.c#L146
-        from psutil.tests import safe_rmpath as rm
-
-        try:
-            return rm(path)
-        except WindowsError:
-            traceback.print_exc()
-
-
 def try_unicode(suffix):
     """Return True if both the fs and the subprocess module can
     deal with a unicode file name.
@@ -142,7 +110,7 @@ def try_unicode(suffix):
         sproc = spawn_testproc(cmd=[testfn])
         shutil.copyfile(testfn, testfn + '-2')
         safe_rmpath(testfn + '-2')
-    except (UnicodeEncodeError, IOError):
+    except (UnicodeEncodeError, OSError):
         return False
     else:
         return True
@@ -180,23 +148,18 @@ class BaseUnicodeTest(PsutilTestCase):
 
 @pytest.mark.xdist_group(name="serial")
 @pytest.mark.skipif(ASCII_FS, reason="ASCII fs")
-@pytest.mark.skipif(PYPY and not PY3, reason="too much trouble on PYPY2")
 class TestFSAPIs(BaseUnicodeTest):
     """Test FS APIs with a funky, valid, UTF8 path name."""
 
     funky_suffix = UNICODE_SUFFIX
 
     def expect_exact_path_match(self):
-        # Do not expect psutil to correctly handle unicode paths on
-        # Python 2 if os.listdir() is not able either.
-        here = '.' if isinstance(self.funky_name, str) else u'.'
         with warnings.catch_warnings():
             warnings.simplefilter("ignore")
-            return self.funky_name in os.listdir(here)
+            return self.funky_name in os.listdir(".")
 
     # ---
 
-    @pytest.mark.skipif(MACOS and not PY3, reason="broken MACOS + PY2")
     def test_proc_exe(self):
         cmd = [
             self.funky_name,
@@ -222,7 +185,6 @@ class TestFSAPIs(BaseUnicodeTest):
         if self.expect_exact_path_match():
             assert name == os.path.basename(self.funky_name)
 
-    @pytest.mark.skipif(MACOS and not PY3, reason="broken MACOS + PY2")
     def test_proc_cmdline(self):
         cmd = [
             self.funky_name,
@@ -265,13 +227,7 @@ class TestFSAPIs(BaseUnicodeTest):
     @pytest.mark.skipif(not POSIX, reason="POSIX only")
     def test_proc_net_connections(self):
         name = self.get_testfn(suffix=self.funky_suffix)
-        try:
-            sock = bind_unix_socket(name)
-        except UnicodeEncodeError:
-            if PY3:
-                raise
-            else:
-                raise pytest.skip("not supported")
+        sock = bind_unix_socket(name)
         with closing(sock):
             conn = psutil.Process().net_connections('unix')[0]
             assert isinstance(conn.laddr, str)
@@ -290,13 +246,7 @@ class TestFSAPIs(BaseUnicodeTest):
             raise ValueError("connection not found")
 
         name = self.get_testfn(suffix=self.funky_suffix)
-        try:
-            sock = bind_unix_socket(name)
-        except UnicodeEncodeError:
-            if PY3:
-                raise
-            else:
-                raise pytest.skip("not supported")
+        sock = bind_unix_socket(name)
         with closing(sock):
             cons = psutil.net_connections(kind='unix')
             conn = find_sock(cons)
@@ -310,13 +260,8 @@ class TestFSAPIs(BaseUnicodeTest):
         psutil.disk_usage(dname)
 
     @pytest.mark.skipif(not HAS_MEMORY_MAPS, reason="not supported")
-    @pytest.mark.skipif(
-        not PY3, reason="ctypes does not support unicode on PY2"
-    )
     @pytest.mark.skipif(PYPY, reason="unstable on PYPY")
     def test_memory_maps(self):
-        # XXX: on Python 2, using ctypes.CDLL with a unicode path
-        # opens a message box which blocks the test run.
         with copyload_shared_lib(suffix=self.funky_suffix) as funky_path:
 
             def normpath(p):
@@ -339,7 +284,6 @@ class TestFSAPIsWithInvalidPath(TestFSAPIs):
     funky_suffix = INVALID_UNICODE_SUFFIX
 
     def expect_exact_path_match(self):
-        # Invalid unicode names are supposed to work on Python 2.
         return True
 
 
@@ -351,16 +295,13 @@ class TestFSAPIsWithInvalidPath(TestFSAPIs):
 class TestNonFSAPIS(BaseUnicodeTest):
     """Unicode tests for non fs-related APIs."""
 
-    funky_suffix = UNICODE_SUFFIX if PY3 else 'è'
+    funky_suffix = UNICODE_SUFFIX
 
     @pytest.mark.skipif(not HAS_ENVIRON, reason="not supported")
     @pytest.mark.skipif(PYPY and WINDOWS, reason="segfaults on PYPY + WINDOWS")
     def test_proc_environ(self):
         # Note: differently from others, this test does not deal
-        # with fs paths. On Python 2 subprocess module is broken as
-        # it's not able to handle with non-ASCII env vars, so
-        # we use "è", which is part of the extended ASCII table
-        # (unicode point <= 255).
+        # with fs paths.
         env = os.environ.copy()
         env['FUNNY_ARG'] = self.funky_suffix
         sproc = self.spawn_testproc(env=env)