# HG changeset patch # User Gregory Szorc # Date 1645388361 25200 # Node ID 9d01ab54df3f6964510c7dd6f3ca1a4244fc766f # Parent 41c552a207162aa367642c81838a1ef8538f841f tests: collapse elif PYTHON3 block PYTHON3 is always True now so this logic should be identical as to before. Differential Revision: https://phab.mercurial-scm.org/D12236 diff -r 41c552a20716 -r 9d01ab54df3f tests/run-tests.py --- a/tests/run-tests.py Sun Feb 20 13:16:44 2022 -0700 +++ b/tests/run-tests.py Sun Feb 20 13:19:21 2022 -0700 @@ -278,12 +278,11 @@ except socket.error as exc: if WINDOWS and exc.errno == errno.WSAEACCES: return False - elif PYTHON3: - # TODO: make a proper exception handler after dropping py2. This - # works because socket.error is an alias for OSError on py3, - # which is also the baseclass of PermissionError. - if isinstance(exc, PermissionError): - return False + # TODO: make a proper exception handler after dropping py2. This + # works because socket.error is an alias for OSError on py3, + # which is also the baseclass of PermissionError. + elif isinstance(exc, PermissionError): + return False if exc.errno not in ( errno.EADDRINUSE, errno.EADDRNOTAVAIL,